1.0.4

1. 添加：支持IDEA和Eclipse双编译器
2. 添加：支持向私库发版 org
3. 添加：支持向公共库发版 cn.openapis

.classpath

@@ -1,15 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hy.common.base"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hy.common.file"/>
-	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/json-smart-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/je-6.4.25.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
-	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hy.common.xjava"/>
-	<classpathentry kind="output" path="bin"/>
+	<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 excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -1,3 +1,3 @@
-/bin
+/target/
 /je-6.4.25
 /db

.project

@@ -5,13 +5,32 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,6 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
-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.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
+
+    <wb-module deploy-name="hy.common.berkeley">
+
+
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+
+
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+
+
+    </wb-module>
+
+
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>

.settings/org.eclipse.core.runtime.prefs → .settings/org.eclipse.wst.validation.prefs

@@ -1,2 +1,2 @@
+disabled=06target
 eclipse.preferences.version=1
-line.separator=\n

Common.003.Win.Berkeley.bat

@@ -1,23 +1,29 @@
 
 
-cd .\bin
+del /Q hy.common.berkeley.jar
+del /Q hy.common.berkeley-sources.jar
 
 
+call mvn clean package
+cd .\target\classes
+
 rd /s/q .\org\hy\common\berkeley\junit
 
 
-jar cvfm hy.common.berkeley.jar MANIFEST.MF META-INF org
+jar cvfm hy.common.berkeley.jar META-INF/MANIFEST.MF META-INF org
 
-copy hy.common.berkeley.jar ..
+copy hy.common.berkeley.jar ..\..
 del /q hy.common.berkeley.jar
-cd ..
+cd ..\..
 
 
 
 
 
-cd .\src
-jar cvfm hy.common.berkeley-sources.jar MANIFEST.MF META-INF org 
-copy hy.common.berkeley-sources.jar ..
-del /q hy.common.berkeley-sources.jar
-cd ..
+cd .\src\main\java
+xcopy /S ..\resources\* .
+jar cvfm hy.common.berkeley-sources.jar META-INF\MANIFEST.MF META-INF org 
+copy hy.common.berkeley-sources.jar ..\..\..
+del /Q hy.common.berkeley-sources.jar
+rd /s/q META-INF
+cd ..\..\..

Maven.Deploy.Win.Berkeley.bat

@@ -1,2 +1,7 @@
-start mvn deploy:deploy-file -Dfile=hy.common.berkeley.jar                              -DpomFile=./src/META-INF/maven/org/hy/common/berkeley/pom.xml -DrepositoryId=thirdparty -Durl=http://HY-ZhengWei:1481/repository/thirdparty
-start mvn deploy:deploy-file -Dfile=hy.common.berkeley-sources.jar -Dclassifier=sources -DpomFile=./src/META-INF/maven/org/hy/common/berkeley/pom.xml -DrepositoryId=thirdparty -Durl=http://HY-ZhengWei:1481/repository/thirdparty
+call mvn install:install-file -Dfile=hy.common.berkeley.jar                              -DpomFile=./src/main/resources/META-INF/maven/cn.openapis/hy.common.berkeley/pom.xml
+call mvn install:install-file -Dfile=hy.common.berkeley-sources.jar -Dclassifier=sources -DpomFile=./src/main/resources/META-INF/maven/cn.openapis/hy.common.berkeley/pom.xml
+
+call mvn deploy:deploy-file   -Dfile=hy.common.berkeley.jar                              -DpomFile=./src/main/resources/META-INF/maven/cn.openapis/hy.common.berkeley/pom.xml -DrepositoryId=thirdparty -Durl=http://HY-ZhengWei:8081/repository/thirdparty
+call mvn deploy:deploy-file   -Dfile=hy.common.berkeley-sources.jar -Dclassifier=sources -DpomFile=./src/main/resources/META-INF/maven/cn.openapis/hy.common.berkeley/pom.xml -DrepositoryId=thirdparty -Durl=http://HY-ZhengWei:8081/repository/thirdparty
+
+pause

Maven.DeployToSonatype.Win.Berkeley.bat

@@ -0,0 +1 @@
+start mvn clean deploy