霍东伟
2019-06-28 f4ed7d65043dfb0a4ae1f93722414db4da2349e8
Merge branch 'dev_lxw' of http://whychdw@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw
3个文件已修改
20 ■■■■ 已修改文件
sensor/.classpath 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sensor/.settings/org.eclipse.jdt.core.prefs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sensor/.settings/org.eclipse.wst.common.project.facet.core.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sensor/.classpath
@@ -3,6 +3,7 @@
    <classpathentry kind="src" path="src"/>
    <classpathentry exported="true" kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/>
    <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_181"/>
    <classpathentry kind="lib" path="lib/c3p0-0.9.5.jar">
        <attributes>
            <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -53,7 +54,11 @@
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/bcprov-ext-jdk15on-161.jar"/>
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/bcprov-jdk15on-161.jar"/>
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/bctls-jdk15on-161.jar"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
        <attributes>
            <attribute name="owner.project.facets" value="java"/>
        </attributes>
    </classpathentry>
    <classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_5.0">
        <attributes>
            <attribute name="owner.project.facets" value="jst.web"/>
sensor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=1.7
sensor/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -6,5 +6,5 @@
  <installed facet="wst.jsdt.web" version="1.0"/>
  <installed facet="jst.jsf" version="1.2"/>
  <installed facet="jst.web.jstl" version="1.2"/>
  <installed facet="java" version="1.8"/>
  <installed facet="java" version="1.7"/>
</faceted-project>