re

qingyezhu · Jun 4, 2014 · 3303e3c · 3303e3c
1 parent 7a1b33d
commit 3303e3c
Show file tree

Hide file tree

Showing 31 changed files with 12 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /target
 /.settings
 /doc
+/disconf-client
diff --git a/disconf-client/.classpath b/disconf-client/.classpath
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/disconf-client/.project b/disconf-client/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>disconf</name>
+	<name>disconf-client</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -17,7 +17,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>com.aptana.projects.webnature</nature>
 	</natures>
 </projectDescription>
diff --git a/disconf-client/target/classes/com/baidu/disconf2/DisconfMgr.class b/disconf-client/target/classes/com/baidu/disconf2/DisconfMgr.class
diff --git a/...ent/target/classes/com/baidu/disconf2/common/annotations/DisconfActiveBackupService.class b/...ent/target/classes/com/baidu/disconf2/common/annotations/DisconfActiveBackupService.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfFile.class b/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfFile.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfFileItem.class b/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfFileItem.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfItem.class b/disconf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfItem.class
diff --git a/...nf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfUpdateService.class b/...nf-client/target/classes/com/baidu/disconf2/common/annotations/DisconfUpdateService.class
diff --git a/...f-client/target/classes/com/baidu/disconf2/common/callback/DisconfSysUpdateCallback.class b/...f-client/target/classes/com/baidu/disconf2/common/callback/DisconfSysUpdateCallback.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/constants/DisConfigTypeEnum.class b/disconf-client/target/classes/com/baidu/disconf2/common/constants/DisConfigTypeEnum.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/inter/IDisconfSysUpdate.class b/disconf-client/target/classes/com/baidu/disconf2/common/inter/IDisconfSysUpdate.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/inter/IDisconfUpdate.class b/disconf-client/target/classes/com/baidu/disconf2/common/inter/IDisconfUpdate.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/model/DisConfCommonModel.class b/disconf-client/target/classes/com/baidu/disconf2/common/model/DisConfCommonModel.class
diff --git a/...f-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterCallbackObject.class b/...f-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterCallbackObject.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterFile.class b/disconf-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterFile.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterItem.class b/disconf-client/target/classes/com/baidu/disconf2/common/model/DisconfCenterItem.class
diff --git a/...nf-client/target/classes/com/baidu/disconf2/common/model/DisconfCommonCallbackModel.class b/...nf-client/target/classes/com/baidu/disconf2/common/model/DisconfCommonCallbackModel.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/core/DisconfCenterCore.class b/disconf-client/target/classes/com/baidu/disconf2/core/DisconfCenterCore.class
diff --git a/disconf-client/target/classes/com/baidu/disconf2/scan/ScanMgr.class b/disconf-client/target/classes/com/baidu/disconf2/scan/ScanMgr.class
diff --git a/disconf-client/target/classes/com/baidu/utils/AutowareConfig.class b/disconf-client/target/classes/com/baidu/utils/AutowareConfig.class
diff --git a/disconf-client/target/classes/com/baidu/utils/ConfigLoaderUtils.class b/disconf-client/target/classes/com/baidu/utils/ConfigLoaderUtils.class
diff --git a/disconf-client/target/classes/com/baidu/utils/DateUtils.class b/disconf-client/target/classes/com/baidu/utils/DateUtils.class
diff --git a/disconf-client/target/classes/com/baidu/utils/EmailConstants.class b/disconf-client/target/classes/com/baidu/utils/EmailConstants.class
diff --git a/disconf-client/target/classes/com/baidu/utils/MachineInfo.class b/disconf-client/target/classes/com/baidu/utils/MachineInfo.class
diff --git a/disconf-client/target/classes/com/baidu/utils/OsUtil.class b/disconf-client/target/classes/com/baidu/utils/OsUtil.class
diff --git a/disconf-client/target/classes/com/baidu/utils/StringNUtils.class b/disconf-client/target/classes/com/baidu/utils/StringNUtils.class
diff --git a/disconf-demo/bin/.project → disconf-core/bin/.project b/disconf-demo/bin/.project → disconf-core/bin/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>disconf-demo</name>
+	<name>disconf-core</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/disconf-demo/bin/.settings/org.eclipse.m2e.core.prefs b/disconf-demo/bin/.settings/org.eclipse.m2e.core.prefs
diff --git a/disconf-demo/bin/README.md b/disconf-demo/bin/README.md
diff --git a/disconf-demo/bin/pom.xml b/disconf-demo/bin/pom.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ @@
     /target
     /.settings
     /doc
+    /disconf-client