From ff22f39d5fedfdd7d6039b2415ea2a935c4efc1e Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.22>
Date: 星期一, 17 十二月 2018 17:38:15 +0800
Subject: [PATCH] 修改
---
gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml | 2 +
gx_tieta/src/com/fgkj/services/User_taskService.java | 2 -
gx_tieta/.classpath | 37 ++++++++++++++++--
gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java | 2 -
gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml | 5 ++
gx_tieta/.settings/org.eclipse.jdt.core.prefs | 7 +--
gx_tieta/src/com/fgkj/services/User_battmaint_checkService.java | 1
gx_tieta/.settings/org.eclipse.wst.common.component | 11 ++++-
8 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/.classpath b/gx_tieta/.classpath
index 4d81c48..f985e98 100644
--- a/gx_tieta/.classpath
+++ b/gx_tieta/.classpath
@@ -3,10 +3,21 @@
<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="lib" path="lib/c3p0-0.9.5.jar"/>
- <classpathentry kind="lib" path="lib/c3p0-oracle-thin-extras-0.9.5.jar"/>
- <classpathentry kind="lib" path="lib/mchange-commons-java-0.2.9.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Sun JDK 1.6.0_13"/>
+ <classpathentry kind="lib" path="lib/c3p0-0.9.5.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/c3p0-oracle-thin-extras-0.9.5.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/mchange-commons-java-0.2.9.jar">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-collections-3.1.jar"/>
@@ -33,5 +44,23 @@
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-api.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-impl.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jacob.jar"/>
+ <classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_5.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jstl_1.2">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web.jstl"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jsf.mojarra_1.2_04">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.jsf"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
</classpath>
diff --git a/gx_tieta/.settings/org.eclipse.jdt.core.prefs b/gx_tieta/.settings/org.eclipse.jdt.core.prefs
index 7a6428b..f287d53 100644
--- a/gx_tieta/.settings/org.eclipse.jdt.core.prefs
+++ b/gx_tieta/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Mar 30 11:35:59 CST 2016
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/gx_tieta/.settings/org.eclipse.wst.common.component b/gx_tieta/.settings/org.eclipse.wst.common.component
index 58adfff..88fc9f5 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.component
+++ b/gx_tieta/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
<wb-module deploy-name="fuguang">
- <wb-resource deploy-path="/" source-path="/WebRoot"/>
+ <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+
<property name="java-output-path" value="/fuguang/WebRoot/WEB-INF/classes"/>
+
<property name="context-root" value="/gx_tieta"/>
+ <property name="me-merge-utility-modules" value="true"/>
+
</wb-module>
+
</project-modules>
diff --git a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
index 0d46547..074e326 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -1,7 +1,10 @@
<root>
<facet id="jst.jsf">
<node name="libprov">
- <attribute name="provider-id" value="jsf-user-library-provider"/>
+ <attribute name="config-id" value="jst.jsf_1.2"/>
+ <attribute name="copy-tlds" value="true"/>
+ <attribute name="provider-id" value="me-jsf-library-provider"/>
+ <attribute name="version-id" value="mojarra_1.2_04"/>
</node>
</facet>
</root>
diff --git a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
index bbe99c2..2921e44 100644
--- a/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/gx_tieta/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <runtime name="com.genuitec.runtime.generic.jee50"/>
<fixed facet="jst.jsf"/>
<installed facet="java" version="1.5"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="1.2"/>
+ <installed facet="jst.web.jstl" version="1.2"/>
</faceted-project>
diff --git a/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java b/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
index 78371a6..695be6a 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
@@ -6,8 +6,6 @@
import java.util.Date;
import java.util.List;
-import sun.org.mozilla.javascript.internal.BaseFunction;
-
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
diff --git a/gx_tieta/src/com/fgkj/services/User_battmaint_checkService.java b/gx_tieta/src/com/fgkj/services/User_battmaint_checkService.java
index ebff859..90f1170 100644
--- a/gx_tieta/src/com/fgkj/services/User_battmaint_checkService.java
+++ b/gx_tieta/src/com/fgkj/services/User_battmaint_checkService.java
@@ -6,7 +6,6 @@
import java.util.Date;
import java.util.List;
-import sun.org.mozilla.javascript.internal.BaseFunction;
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
diff --git a/gx_tieta/src/com/fgkj/services/User_taskService.java b/gx_tieta/src/com/fgkj/services/User_taskService.java
index 33000e9..6c197b2 100644
--- a/gx_tieta/src/com/fgkj/services/User_taskService.java
+++ b/gx_tieta/src/com/fgkj/services/User_taskService.java
@@ -6,8 +6,6 @@
import java.util.Date;
import java.util.List;
-import sun.org.mozilla.javascript.internal.BaseFunction;
-
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
--
Gitblit v1.9.1