diff --git a/serverApps/.classpath b/serverApps/.classpath index 49bdb0f660..bc560c5906 100644 --- a/serverApps/.classpath +++ b/serverApps/.classpath @@ -1,7 +1,6 @@ - @@ -11,5 +10,6 @@ + diff --git a/serverApps/.settings/org.eclipse.jdt.core.prefs b/serverApps/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..6cde564def --- /dev/null +++ b/serverApps/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +#Wed Jul 14 15:53:17 MYT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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.6 diff --git a/serverApps/META-INF/MANIFEST.MF b/serverApps/META-INF/MANIFEST.MF index 142c1fb297..ca2fff43d2 100644 --- a/serverApps/META-INF/MANIFEST.MF +++ b/serverApps/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: serverApps Bundle-SymbolicName: org.adempiere.serverApps;singleton:=true -Bundle-Version: 0.0.0.1 +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: serverApps.jar, src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar, src/web/WEB-INF/lib/commons-beanutils-core.jar, @@ -13,14 +13,12 @@ Bundle-ClassPath: serverApps.jar, src/web/WEB-INF/lib/commons-lang-2.1.jar, src/web/WEB-INF/lib/commons-validator-1.2.0.jar Eclipse-RegisterBuddy: org.adempiere.tools -Require-Bundle: org.eclipse.osgi.services;bundle-version="3.1.100", - org.eclipse.core.runtime;bundle-version="3.5.0", - org.apache.xerces;bundle-version="2.9.0", +Require-Bundle: org.apache.xerces;bundle-version="2.9.0", org.apache.xml.serializer;bundle-version="2.7.1", com.springsource.javax.servlet;bundle-version="2.5.0", - org.adempiere.client;bundle-version="0.0.0", - org.adempiere.base;bundle-version="0.0.0", - org.adempiere.tools;bundle-version="0.0.0", + org.adempiere.client;bundle-version="1.0.0", + org.adempiere.base;bundle-version="1.0.0", + org.adempiere.tools;bundle-version="1.0.0", com.springsource.javax.servlet.jsp;bundle-version="2.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.apache.commons.beanutils, diff --git a/serverApps/build.properties b/serverApps/build.properties index bfeb264323..e2da89cd94 100644 --- a/serverApps/build.properties +++ b/serverApps/build.properties @@ -1,4 +1,4 @@ -output.serverApps.jar = build/classes +output.serverApps.jar = build/classes/ source.serverApps.jar = src/main/servlet/ bin.includes = META-INF/,\ serverApps.jar,\