Author: marrs
Date: Wed Mar 26 16:08:05 2014
New Revision: 1581901
URL: http://svn.apache.org/r1581901
Log:
More changes to make baselining work in Eclipse and from the command line.
Added:
ace/trunk/cnf/ecj/
ace/trunk/cnf/ecj/ecj.jar (with props)
ace/trunk/cnf/ecj/jdtCompilerAdapter.jar (with props)
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/DiscoveryConstants.java
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/IdentificationConstants.java
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/OBRFileStoreConstants.java
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryConstants.java
Removed:
ace/trunk/org.apache.ace.agent.controller.itest/.settings/
ace/trunk/org.apache.ace.agent.itest/.settings/
ace/trunk/org.apache.ace.agent.launcher/.settings/
ace/trunk/org.apache.ace.agent.update.itest/.settings/
ace/trunk/org.apache.ace.agent/.settings/
ace/trunk/org.apache.ace.authentication.itest/.settings/
ace/trunk/org.apache.ace.bnd/.settings/
ace/trunk/org.apache.ace.client.repository.itest/.settings/
ace/trunk/org.apache.ace.client.repository/.settings/
ace/trunk/org.apache.ace.client.rest.itest/.settings/
ace/trunk/org.apache.ace.client.workspace/.settings/
ace/trunk/org.apache.ace.configurator.useradmin.itest/.settings/
ace/trunk/org.apache.ace.deployment.itest/.settings/
ace/trunk/org.apache.ace.deployment/.settings/
ace/trunk/org.apache.ace.discovery/.settings/
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java
ace/trunk/org.apache.ace.gogo.servlet/.settings/
ace/trunk/org.apache.ace.gogo/.settings/
ace/trunk/org.apache.ace.http.itest/.settings/
ace/trunk/org.apache.ace.http/.settings/
ace/trunk/org.apache.ace.identification/.settings/
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/constants/IdentificationConstants.java
ace/trunk/org.apache.ace.log.itest/.settings/
ace/trunk/org.apache.ace.log.server.store.itest/.settings/
ace/trunk/org.apache.ace.nodelauncher/.settings/
ace/trunk/org.apache.ace.obr/.settings/
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/constants/OBRFileStoreConstants.java
ace/trunk/org.apache.ace.repository.itest/.settings/
ace/trunk/org.apache.ace.repository/.settings/
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java
ace/trunk/org.apache.ace.test/.settings/
ace/trunk/org.apache.ace.verifier/.settings/
ace/trunk/run-client/.settings/
ace/trunk/run-obr/.settings/
ace/trunk/run-relay/.settings/
ace/trunk/run-server-allinone/.settings/
ace/trunk/run-server/.settings/
ace/trunk/run-target/.settings/
Modified:
ace/trunk/cnf/build-template.xml
ace/trunk/cnf/ext/defaults.bnd
ace/trunk/cnf/localrepo/index.xml
ace/trunk/cnf/releaserepo/index.xml
ace/trunk/cnf/releaserepo/org.apache.ace.agent.itest/org.apache.ace.agent.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.agent.launcher/org.apache.ace.agent.launcher-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.agent/org.apache.ace.agent-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.ant.tasks/org.apache.ace.ant.tasks-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.api/org.apache.ace.authentication.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.impl/org.apache.ace.authentication.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.itest/org.apache.ace.authentication.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.processor.basicauth/org.apache.ace.authentication.processor.basicauth-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.processor.clientcert/org.apache.ace.authentication.processor.clientcert-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.authentication.processor.password/org.apache.ace.authentication.processor.password-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.builder/org.apache.ace.builder-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.automation/org.apache.ace.client.automation-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.api/org.apache.ace.client.repository.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.helper.base/org.apache.ace.client.repository.helper.base-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.helper.bundle/org.apache.ace.client.repository.helper.bundle-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.helper.configuration/org.apache.ace.client.repository.helper.configuration-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.helper.user/org.apache.ace.client.repository.helper.user-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.impl/org.apache.ace.client.repository.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.repository.itest/org.apache.ace.client.repository.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.rest.itest/org.apache.ace.client.rest.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.client.rest/org.apache.ace.client.rest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.configurator.impl/org.apache.ace.configurator.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.configurator.serveruseradmin/org.apache.ace.configurator.serveruseradmin-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.configurator.useradmin.itest/org.apache.ace.configurator.useradmin.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.configurator.useradmin.task/org.apache.ace.configurator.useradmin.task-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.connectionfactory/org.apache.ace.connectionfactory-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.consolelogger/org.apache.ace.consolelogger-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.api/org.apache.ace.deployment.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.deploymentadmin/org.apache.ace.deployment.deploymentadmin-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.itest/org.apache.ace.deployment.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.provider.api/org.apache.ace.deployment.provider.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.provider.base/org.apache.ace.deployment.provider.base-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.provider.filebased/org.apache.ace.deployment.provider.filebased-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.provider.repositorybased/org.apache.ace.deployment.provider.repositorybased-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.rp.autoconf.itest/org.apache.ace.deployment.rp.autoconf.itest-0.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.rp.autoconf/org.apache.ace.deployment.rp.autoconf-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.servlet/org.apache.ace.deployment.servlet-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.streamgenerator/org.apache.ace.deployment.streamgenerator-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.task.base/org.apache.ace.deployment.task.base-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.task/org.apache.ace.deployment.task-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.deployment.util.test/org.apache.ace.deployment.util.test-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.discovery.api/org.apache.ace.discovery.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.discovery.property/org.apache.ace.discovery.property-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.discovery.upnp/org.apache.ace.discovery.upnp-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.http.itest/org.apache.ace.http.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.http.listener/org.apache.ace.http.listener-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.http.redirector/org.apache.ace.http.redirector-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.identification.api/org.apache.ace.identification.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.identification.ifconfig/org.apache.ace.identification.ifconfig-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.identification.property/org.apache.ace.identification.property-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.launcher/org.apache.ace.launcher-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.location.upnp/org.apache.ace.location.upnp-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.api/org.apache.ace.log.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.itest/org.apache.ace.log.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.listener/org.apache.ace.log.listener-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.servlet/org.apache.ace.log.server.servlet-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.api/org.apache.ace.log.server.store.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.file/org.apache.ace.log.server.store.file-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.itest/org.apache.ace.log.server.store.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.store.mongo/org.apache.ace.log.server.store.mongo-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.task/org.apache.ace.log.server.task-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.server.ui/org.apache.ace.log.server.ui-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.target.store.impl/org.apache.ace.log.target.store.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.log.target/org.apache.ace.log.target-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.managementagent/org.apache.ace.managementagent-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.amazon/org.apache.ace.nodelauncher.amazon-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.api/org.apache.ace.nodelauncher.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.nodelauncher.ui/org.apache.ace.nodelauncher.ui-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.obr.metadata/org.apache.ace.obr.metadata-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.obr.servlet/org.apache.ace.obr.servlet-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.obr.storage/org.apache.ace.obr.storage-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.processlauncher/org.apache.ace.processlauncher-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.range.api/org.apache.ace.range.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.api/org.apache.ace.repository.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.ext/org.apache.ace.repository.ext-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.impl/org.apache.ace.repository.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.itest/org.apache.ace.repository.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.servlet/org.apache.ace.repository.servlet-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.repository.task/org.apache.ace.repository.task-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.resourceprocessor.useradmin/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.api/org.apache.ace.scheduler.api-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.scheduler.impl/org.apache.ace.scheduler.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.tageditor/org.apache.ace.tageditor-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.target.mgmt.ui/org.apache.ace.target.mgmt.ui-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.test/org.apache.ace.test-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui.itest/org.apache.ace.useradmin.ui.itest-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.useradmin.ui/org.apache.ace.useradmin.ui-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.verifier.impl/org.apache.ace.verifier.impl-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.verifier.ui/org.apache.ace.verifier.ui-1.0.0.jar
ace/trunk/cnf/releaserepo/org.apache.ace.webui.vaadin/org.apache.ace.webui.vaadin-1.0.0.jar
ace/trunk/org.apache.ace.agent.controller.itest/.classpath
ace/trunk/org.apache.ace.agent.itest/.classpath
ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
ace/trunk/org.apache.ace.bnd/bnd.bnd
ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
ace/trunk/org.apache.ace.configurator.useradmin.itest/src/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
ace/trunk/org.apache.ace.deployment/task.base.bnd
ace/trunk/org.apache.ace.discovery/api.bnd
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java
ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java
ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java
ace/trunk/org.apache.ace.gogo.servlet/.classpath
ace/trunk/org.apache.ace.identification/.classpath
ace/trunk/org.apache.ace.identification/api.bnd
ace/trunk/org.apache.ace.identification/ifconfig.bnd
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/PropertyBasedIdentification.java
ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/PropertyBasedIdentificationTest.java
ace/trunk/org.apache.ace.identification/test/org/apache/ace/identification/property/SimpleIdentificationTest.java
ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryImpl.java
ace/trunk/run-relay/.classpath
Modified: ace/trunk/cnf/build-template.xml
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/build-template.xml?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/cnf/build-template.xml (original)
+++ ace/trunk/cnf/build-template.xml Wed Mar 26 16:08:05 2014
@@ -73,7 +73,10 @@
-->
<target name="compile" depends="dependencies" if="project.sourcepath">
<mkdir dir="${project.output}"/>
- <javac fork="yes" executable="${javac}"
srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}"
deprecation="true" listfiles="true" target="${javac.target}"
source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no"
verbose="${verbose}" />
+ <componentdef name="ecj"
classname="org.eclipse.jdt.core.JDTCompilerAdapter"
classpath="${workspacedir}/cnf/ecj/ecj.jar:${workspacedir}/cnf/ecj/jdtCompilerAdapter.jar"
/>
+ <javac fork="yes" executable="${javac}"
srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" deprecation="true" listfiles="true"
target="${javac.target}" source="${javac.source}" debug="${javac.debug}"
includeAntRuntime="no" verbose="${verbose}">
+ <ecj />
+ </javac>
<copy todir="${project.output}" verbose="${verbose}"
preservelastmodified="true">
<fileset dir="${project.sourcepath}">
<exclude name="**/*.java" />
@@ -81,6 +84,29 @@
</fileset>
</copy>
</target>
+
+ <!-- ECJ Compiler support -->
+ <target name="install-ecj" depends="init, install-ecj-eclipse,
install-ecj-noeclipse">
+ </target>
+
+ <target name="install-ecj-eclipse" if="eclipse.home">
+ <echo message="Eclipse is installed at ${eclipse.home}." />
+ <mkdir dir="ecj" />
+ <copy tofile="ecj/ecj.jar">
+ <fileset dir="${eclipse.home}/plugins">
+ <include name="org.eclipse.jdt.core_*.jar" />
+ </fileset>
+ </copy>
+ <unzip src="ecj/ecj.jar" dest="ecj">
+ <patternset>
+ <include name="jdtCompilerAdapter.jar" />
+ </patternset>
+ </unzip>
+ </target>
+
+ <target name="install-ecj-noeclipse" unless="eclipse.home">
+ <echo message="Please run this ant task from within Eclipse and
make sure you're using the 'same JRE as the workspace' setting." />
+ </target>
<!--
JARS
Added: ace/trunk/cnf/ecj/ecj.jar
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/ecj/ecj.jar?rev=1581901&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/trunk/cnf/ecj/ecj.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/trunk/cnf/ecj/jdtCompilerAdapter.jar
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/ecj/jdtCompilerAdapter.jar?rev=1581901&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/trunk/cnf/ecj/jdtCompilerAdapter.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ace/trunk/cnf/ext/defaults.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/ext/defaults.bnd?rev=1581901&r1=1581900&r2=1581901&view=diff
==============================================================================
--- ace/trunk/cnf/ext/defaults.bnd (original)
+++ ace/trunk/cnf/ext/defaults.bnd Wed Mar 26 16:08:05 2014
@@ -20,8 +20,8 @@ project.name: ${p}
# Java Compiler Options
java: java
javac: javac
-javac.source: 1.6
-javac.target: 1.6
+javac.source: 1.7
+javac.target: 1.7
javac.debug: on
# Bnd Options
