You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/20 14:13:45 UTC
svn commit: r1083440 - in /aries/trunk/samples: ./
ariestrader/assemblies/equinox-test-harness/
ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/
ariestrader/modules/ariestrader-derby-ds/ ariestrader/modules/ariestr...
Author: zoe
Date: Sun Mar 20 13:13:44 2011
New Revision: 1083440
URL: http://svn.apache.org/viewvc?rev=1083440&view=rev
Log:
ARIES-610 Move all versions to samples pom and use filter for twitter
Added:
aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/
aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/
aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/
aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
Removed:
aries/trunk/samples/twitter/twitter-itests/src/test/resources/
Modified:
aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
aries/trunk/samples/blog/blog-assembly/pom.xml
aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
aries/trunk/samples/blog/blog-itests/pom.xml
aries/trunk/samples/blog/blog-web/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
aries/trunk/samples/blueprint/helloworld/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
aries/trunk/samples/pom.xml
aries/trunk/samples/twitter/pom.xml
aries/trunk/samples/twitter/twitter-bundle/pom.xml
aries/trunk/samples/twitter/twitter-itests/pom.xml
aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Sun Mar 20 13:13:44 2011
@@ -114,7 +114,6 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Sun Mar 20 13:13:44 2011
@@ -16,49 +16,47 @@
# under the License.
osgi.bundles=\
-cm-3.2.0-v20070116.jar@start,\
-services-3.1.200-v20070605.jar@start,\
-asm-all-3.2.jar@start,\
-pax-logging-api-1.4.jar@start,\
-pax-logging-service-1.4.jar@start,\
-derby-10.5.3.0_1.jar@start,\
-commons-collections-3.2.1.jar@start,\
-commons-lang-2.5.jar@start,\
-commons-pool-1.5.4.jar@start,\
-org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
+cm-${cmVersion}.jar@start,\
+services-${servicesVersion}.jar@start,\
+asm-all-${asmVersion}.jar@start,\
+pax-logging-api-${paxLoggingApiVersion}.jar@start,\
+pax-logging-service-${paxLoggingServiceVersion}.jar@start,\
+derby-${derbyVersion}.jar@start,\
+commons-collections-${commonsCollectionsVersion}.jar@start,\
+commons-lang-${commonsLangVersion}.jar@start,\
+commons-pool-${commonsPoolVersion}.jar@start,\
+org.apache.servicemix.bundles.serp-${servicemixBundlesSerpVersion}.jar@start,\
openjpa-${openjpaVersion}.jar@start,\
-geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\
+geronimo-j2ee-connector_1.5_spec-${geronimoJ2eeConnector15SpecVersion}.jar@start,\
geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
-pax-web-jetty-bundle-0.8.1.jar@start,\
-pax-web-extender-war-0.8.1.jar@start,\
-pax-web-jsp-0.8.1.jar@start,\
-org.apache.felix.fileinstall-3.1.4.jar@start,\
-org.apache.felix.bundlerepository-1.6.4.jar@start,\
-org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.deployment.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.modeller-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.resolver.obr-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
+pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\
+pax-web-extender-war-${paxWebExtenderWarVersion}.1.jar@start,\
+pax-web-jsp-${paxWebJspVersion}.jar@start,\
+org.apache.felix.fileinstall-${felixFileinstallVersion}.jar@start,\
+org.apache.felix.bundlerepository-${felixBundleRepositoryVersion}.jar@start,\
+org.apache.aries.application.install-${ariesApplicationInstallVersion}.jar@start,\
+org.apache.aries.application.management-${ariesApplicationInstallManagementVersion}.jar@start,\
+org.apache.aries.application.api-${ariesApplicationApiVersion}.jar@start,\
+org.apache.aries.application.utils-${ariesApplicationUtilsVersion}.jar@start,\
+org.apache.aries.application.runtime-${ariesApplicationRuntimeVersion}.jar@start,\
+org.apache.aries.application.deployment.management-${ariesApplicationDeploymentManagementVersion}.jar@start,\
+org.apache.aries.application.modeller-${ariesApplicationModellerVersion}.jar@start,\
+org.apache.aries.application.resolver.obr-${ariesApplicationObrResolverVersion}.jar@start,\
+org.apache.aries.application.default.local.platform-${ariesApplicationDefaultLocalPlatformVersion}.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
-org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
+org.apache.aries.jpa.api-${ariesJpaApiVersion}.jar@start,\
+org.apache.aries.jpa.blueprint.aries-${ariesJpaBlueprintAriesVersion}.jar@start,\
+org.apache.aries.jpa.container-${ariesJpaContainerVersion}.jar@start,\
+org.apache.aries.jpa.container.context-${ariesJpaContainerContextVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
-org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
-org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
-org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start,\
+org.apache.aries.transaction.blueprint-${ariesTransactionBlueprintVersion}.jar@start,\
+org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
+org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start,\
org.apache.aries.samples.ariestrader.derby.ds-${version}.jar@start
eclipse.ignoreApp=true
org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml Sun Mar 20 13:13:44 2011
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
- <version>${ariesTransactionVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml Sun Mar 20 13:13:44 2011
@@ -46,13 +46,6 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml Sun Mar 20 13:13:44 2011
@@ -46,13 +46,6 @@
<artifactId>org.apache.aries.samples.ariestrader.entities</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml Sun Mar 20 13:13:44 2011
@@ -46,13 +46,6 @@
<artifactId>org.apache.aries.samples.ariestrader.entities</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
Modified: aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ aries/trunk/samples/blog/blog-assembly/pom.xml Sun Mar 20 13:13:44 2011
@@ -214,7 +214,6 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
</dependency>
<dependency>
Modified: aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Sun Mar 20 13:13:44 2011
@@ -16,52 +16,50 @@
# under the License.
osgi.bundles=\
-cm-3.2.0-v20070116.jar@start,\
-services-3.1.200-v20070605.jar@start,\
-asm-all-3.2.jar@start,\
-pax-logging-api-1.4.jar@start,\
-pax-logging-service-1.4.jar@start,\
-derby-10.5.3.0_1.jar@start,\
-pax-web-jetty-bundle-0.8.1.jar@start,\
-pax-web-extender-war-0.8.1.jar@start,\
-pax-web-jsp-0.8.1.jar@start,\
+cm-${cmVersion}@start,\
+services-${servicesVersion}.jar@start,\
+asm-all-${asmVersion}.jar@start,\
+pax-logging-api-${paxLoggingApiVersion}.jar@start,\
+pax-logging-service-${paxLoggingServiceVersion}.jar@start,\
+derby-${derbyVersion}.jar@start,\
+pax-web-jetty-bundle-${paxWebJettyBundleVersion}.jar@start,\
+pax-web-extender-war-${paxWebExtenderWarVersion}.jar@start,\
+pax-web-jsp-${paxWebJspVersion}.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
-org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.utils-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.deployment.management-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.modeller-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.resolver.obr-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
-org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-3.1.4.jar@start,\
-org.apache.felix.bundlerepository-1.6.4.jar@start,\
-org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
-commons-collections-3.2.1.jar@start,\
-commons-lang-2.5.jar@start,\
-commons-pool-1.5.4.jar@start,\
-geronimo-j2ee-connector_1.5_spec-2.0.0.jar@start,\
+org.apache.aries.application.install-${ariesApplicationInstallVersion}.jar@start,\
+org.apache.aries.application.management-${ariesApplicationManagementVersion}.jar@start,\
+org.apache.aries.application.api-${ariesApplicationApiVersion}.jar@start,\
+org.apache.aries.application.utils-${ariesApplicationUtilsVersion}.jar@start,\
+org.apache.aries.application.deployment.management-${ariesApplicationDeploymentManagementVersion}.jar@start,\
+org.apache.aries.application.modeller-${ariesApplicationModellerVersion}.jar@start,\
+org.apache.aries.application.resolver.obr-${ariesApplicationObrResolverVersion}.jar@start,\
+org.apache.aries.application.default.local.platform-${ariesApplicationDefaultLocalPlatformVersion}.jar@start,\
+org.apache.aries.application.runtime-${ariesApplicationRuntimeVersion}.jar@start,\
+org.apache.felix.fileinstall-${felixFileinstallVersion}.jar@start,\
+org.apache.felix.bundlerepository-${felixBundlerepositoryVersion}.jar@start,\
+commons-collections-${commonsCollectionsVersion}.jar@start,\
+commons-lang-${commonsLangVersion}.jar@start,\
+commons-pool-${commonsPoolVersion}.jar@start,\
+geronimo-j2ee-connector_1.5_spec-${geronimoJ2eeConnector15SpecVersion}.jar@start,\
geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
openjpa-${openjpaVersion}.jar@start,\
-org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container-${ariesJpaVersion}.jar@start,\
-org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
+org.apache.aries.jpa.api-${ariesJpaApiVersion}.jar@start,\
+org.apache.aries.jpa.blueprint.aries-${ariesJpaBlueprintAriesVersion}.jar@start,\
+org.apache.aries.jpa.container-${ariesJpaContainerVersion}.jar@start,\
+org.apache.aries.jpa.container.context-${ariesJpaContainerContextVersion}.jar@start,\
org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
-org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
-org.apache.servicemix.bundles.serp-1.13.1_2.jar@start,\
+org.apache.aries.transaction.manager-${ariesTransactionManagerVersion}.jar@start,\
+org.apache.servicemix.bundles.serp-${servicemixBundlesSerpVersion}.jar@start,\
org.apache.aries.samples.blog.datasource-${version}.jar@start,\
-org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start
+org.apache.aries.transaction.wrappers-${ariesTransactionWrappersVersion}.jar@start
eclipse.ignoreApp=true
-org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
+org.ops4j.pax.logging.DefaultServiceLog.level=INFO
org.osgi.framework.system.packages=\
javax.accessibility,\
javax.activation,\
Modified: aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ aries/trunk/samples/blog/blog-itests/pom.xml Sun Mar 20 13:13:44 2011
@@ -160,7 +160,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
<scope>test</scope>
</dependency>
@@ -191,7 +190,6 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
<scope>test</scope>
</dependency>
Modified: aries/trunk/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-web/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-web/pom.xml (original)
+++ aries/trunk/samples/blog/blog-web/pom.xml Sun Mar 20 13:13:44 2011
@@ -53,7 +53,7 @@
<Private-Package>org.apache.aries.samples.blog.web.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.web.*</Export-Package>
<Import-Package>
- javax.servlet*;version=2.5,
+ javax.servlet*;version=${javaxServletVersion},
*
</Import-Package>
<_wab>src/main/webapp/</_wab>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml Sun Mar 20 13:13:44 2011
@@ -66,12 +66,10 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
</dependency>
Modified: aries/trunk/samples/blueprint/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/pom.xml Sun Mar 20 13:13:44 2011
@@ -60,7 +60,7 @@
<module>helloworld-server</module>
<module>helloworld-client</module>
<module>helloworld-assembly</module>
- <module>helloworld-eba</module>
+ <module>helloworld-eba</module>
</modules>
</project>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml Sun Mar 20 13:13:44 2011
@@ -38,9 +38,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-<!--
- <Bundle-Blueprint>/test.xml</Bundle-Blueprint>
--->
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml Sun Mar 20 13:13:44 2011
@@ -51,7 +51,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
</dependency>
<dependency>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml Sun Mar 20 13:13:44 2011
@@ -60,9 +60,6 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId};blueprint.graceperiod:=true;blueprint.timeout:= 60000</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.samples.blueprint.idverifier.client.IDVerifierClientActivator</Bundle-Activator>
- <!--
- <Bundle-Blueprint>/test.xml</Bundle-Blueprint>
- -->
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml Sun Mar 20 13:13:44 2011
@@ -37,9 +37,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-<!--
- <Bundle-Blueprint>/test.xml</Bundle-Blueprint>
--->
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Sun Mar 20 13:13:44 2011
@@ -39,21 +39,121 @@
</scm>
<properties>
+ <!-- Aries Application Versions -->
+ <ariesApplicationApiVersion>0.3.1-SNAPSHOT</ariesApplicationApiVersion>
<ariesApplicationVersion>0.3.1-SNAPSHOT</ariesApplicationVersion>
+ <ariesApplicationConvertersVersion>0.3.1-SNAPSHOT</ariesApplicationConvertersVersion>
+ <ariesApplicationDefaultLocalPlatformVersion>0.3.1-SNAPSHOT</ariesApplicationDefaultLocalPlatformVersion>
+ <ariesApplicationDeploymentManagementVersion>0.3.1-SNAPSHOT</ariesApplicationDeploymentManagementVersion>
+ <ariesApplicationInstallVersion>0.3.1-SNAPSHOT</ariesApplicationInstallVersion>
+ <ariesApplicationItestInterfaceVersion>0.3.1-SNAPSHOT</ariesApplicationItestInterfaceVersion>
+ <ariesApplicationManagementVersion>0.3.1-SNAPSHOT</ariesApplicationManagementVersion>
+ <ariesApplicationModellerVersion>0.3.1-SNAPSHOT</ariesApplicationModellerVersion>
+ <ariesApplicationNoopResolverVersion>0.3.1-SNAPSHOT</ariesApplicationNoopResolverVersion>
+ <ariesApplicationObrResolverVersion>0.3.1-SNAPSHOT</ariesApplicationObrResolverVersion>
+ <ariesApplicationRuntimeVersion>0.3.1-SNAPSHOT</ariesApplicationRuntimeVersion>
+ <ariesApplicationRuntimeFrameworkVersion>0.3.1-SNAPSHOT</ariesApplicationRuntimeFrameworkVersion>
+ <ariesApplicationRuntimeFrameworkManagementVersion>0.3.1-SNAPSHOT</ariesApplicationRuntimeFrameworkManagementVersion>
+ <ariesApplicationRuntimeIsolatedVersion>0.3.1-SNAPSHOT</ariesApplicationRuntimeIsolatedVersion>
+ <ariesApplicationRuntimeRepositoryVersion>0.3.1-SNAPSHOT</ariesApplicationRuntimeRepositoryVersion>
+ <ariesApplicationUtilsVersion>0.3.1-SNAPSHOT</ariesApplicationUtilsVersion>
+
+ <!-- Aries Blueprint Versions -->
+ <ariesBlueprintAnnotationApiVersion>0.3.2-SNAPSHOT</ariesBlueprintAnnotationApiVersion>
+ <ariesBlueprintAnnotationImplVersion>0.3.2-SNAPSHOT</ariesBlueprintAnnotationImplVersion>
+ <ariesBlueprintApiVersion>0.3.2-SNAPSHOT</ariesBlueprintApiVersion>
<ariesBlueprintVersion>0.3.2-SNAPSHOT</ariesBlueprintVersion>
+ <ariesBlueprintCmVersion>0.3.2-SNAPSHOT</ariesBlueprintCmVersion>
+ <ariesBlueprintCoreVersion>0.3.2-SNAPSHOT</ariesBlueprintCoreVersion>
+
+ <!-- Aries Jmx Versions -->
+ <ariesJmxiApiVersion>0.3.1-SNAPSHOT</ariesJmxiApiVersion>
+ <ariesJmxBluePrintApiVersion>0.3.1-SNAPSHOT</ariesJmxBluePrintApiVersion>
+ <ariesJmxBlueprintVersion>0.3.1-SNAPSHOT</ariesJmxBlueprintVersion>
+ <ariesJmxBlueprintCoreVersion>0.3.1-SNAPSHOT</ariesJmxBlueprintCoreVersion>
<ariesJmxVersion>0.3.1-SNAPSHOT</ariesJmxVersion>
+ <ariesJmxCoreVersion>0.3.1-SNAPSHOT</ariesJmxCoreVersion>
+ <ariesJmxWhiteboardVersion>0.3.1-SNAPSHOT</ariesJmxWhiteboardVersion>
+
+ <!-- Aries Jndi Versions -->
+ <ariesJndiApiVersion>0.3.1-SNAPSHOT</ariesJndiApiVersion>
<ariesJndiVersion>0.3.1-SNAPSHOT</ariesJndiVersion>
- <ariesJpaVersion>0.3.1-SNAPSHOT</ariesJpaVersion>
+ <ariesJndiCoreVersion>0.3.1-SNAPSHOT</ariesJndiCoreVersion>
+ <ariesJndiLegacySupportVersion>0.3.1-SNAPSHOT</ariesJndiLegacySupportVersion>
+ <ariesJndiRmiVersion>0.3.1-SNAPSHOT</ariesJndiRmiVersion>
+ <ariesJndiUrlVersion>0.3.1-SNAPSHOT</ariesJndiUrlVersion>
+
+ <!-- Aries Jpa Versions -->
+ <ariesJpaApiVersion>0.3.1-SNAPSHOT</ariesJpaApiVersion>
+ <ariesJpaBlueprintAriesVersion>0.3.1-SNAPSHOT</ariesJpaBlueprintAriesVersion>
+ <ariesJpaContainerVersion>0.3.1-SNAPSHOT</ariesJpaContainerVersion>
+ <ariesJpaContainerContextVersion>0.3.1-SNAPSHOT</ariesJpaContainerContextVersion>
+
+ <!-- Aries Proxy Versions -->
+ <ariesProxyApiVersion>0.3.1-SNAPSHOT</ariesProxyApiVersion>
<ariesProxyVersion>0.3.1-SNAPSHOT</ariesProxyVersion>
- <ariesQuiesceVersion>0.3.1-SNAPSHOT</ariesQuiesceVersion>
- <ariesTransactionVersion>0.3.1-SNAPSHOT</ariesTransactionVersion>
+ <ariesProxyImplVersion>0.3.1-SNAPSHOT</ariesProxyImplVersion>
+
+ <!-- Aries Quiesce Versions -->
+ <ariesQuiesceApiVersion>0.3.1-SNAPSHOT</ariesQuiesceApiVersion>
+ <ariesQuiesceManagerVersion>0.3.1-SNAPSHOT</ariesQuiesceManagerVersion>
+
+
+ <!-- Aries Testsupport Versions -->
+ <ariesTestsupportUnitVersion>0.3.1-SNAPSHOT</ariesTestsupportUnitVersion>
+
+ <!-- Aries Transaction Versions -->
+ <ariesTransactionBlueprintVersion>0.3.1-SNAPSHOT</ariesTransactionBlueprintVersion>
+ <ariesTransactionManagerVersion>0.3.1-SNAPSHOT</ariesTransactionManagerVersion>
+ <ariesTransactionTestdsVersion>0.3.1-SNAPSHOT</ariesTransactionTestdsVersion>
+ <ariesTransactionWrappersVersion>0.3.1-SNAPSHOT</ariesTransactionWrappersVersion>
+
+ <!-- Aries Util Versions -->
<ariesUtilVersion>0.4-SNAPSHOT</ariesUtilVersion>
+
+ <!-- Aries Web Versions -->
<ariesWebVersion>0.3.1-SNAPSHOT</ariesWebVersion>
+
+
+
+ <!-- External Dependencies -->
+ <cmVersion>3.2.0-v20070116</cmVersion>
+ <servicesVersion>3.1.200-v20070605</servicesVersion>
+ <asmVersion>3.2</asmVersion>
+ <paxLoggingApiVersion>1.4</paxLoggingApiVersion>
+ <paxLoggingServiceVersion>1.4</paxLoggingServiceVersion>
+ <derbyVersion>10.5.3.0_1</derbyVersion>
+ <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion>
+ <commonsLangVersion>2.5</commonsLangVersion>
+ <commonsPoolVersion>1.5.4</commonsPoolVersion>
+ <servicemixBundlesSerpVersion>1.13.1_2</servicemixBundlesSerpVersion>
+ <servicemixBundlesCglibVersion>2.1_3_4</servicemixBundlesCglibVersion>
+
<openjpaVersion>2.0.0</openjpaVersion>
<geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
<geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
<geronimoTransactionVersion>2.1.3</geronimoTransactionVersion>
<geronimoServletVersion>1.2</geronimoServletVersion>
+ <geronimoJ2eeConnector15SpecVersion>2.0.0</geronimoJ2eeConnector15SpecVersion>
+ <geronimoJsp21SpecVersion>1.0.1</geronimoJsp21SpecVersion>
+
+ <paxWebJettyBundleVersion>0.8.1</paxWebJettyBundleVersion>
+ <paxWebExtenderWarVersion>0.8.1</paxWebExtenderWarVersion>
+ <paxWebJspVersion>0.8.1</paxWebJspVersion>
+
+ <felixFileinstallVersion>3.1.4</felixFileinstallVersion>
+ <felixBundleRepositoryVersion>1.6.4</felixBundleRepositoryVersion>
+ <felixMainVersion>2.0.4</felixMainVersion>
+ <felixShellVersion>1.4.2</felixShellVersion>
+ <felixShellTuiVersion>1.4.1</felixShellTuiVersion>
+ <felixEventAdminVersion>1.2.2</felixEventAdminVersion>
+ <felixBundlerepositoryVersion>1.6.4</felixBundlerepositoryVersion>
+ <felixConfigadminVersion>1.2.4</felixConfigadminVersion>
+ <serpVersion>1.13.1</serpVersion>
+ <javaxServletVersion>1.2</javaxServletVersion>
+
+ <twitter4jVersion>2.0.8</twitter4jVersion>
+
<aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
</properties>
@@ -62,57 +162,69 @@
<!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
<!-- External project dependencies -->
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${asmVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>2.0.4</version>
+ <version>${felixMainVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${felixConfigadminVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.4.2</version>
+ <version>${felixShellVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.4.1</version>
+ <version>${felixShellTuiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.2.2</version>
+ <version>${felixEventAdminVersion}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
- <version>0.8.1</version>
+ <version>${paxWebExtenderWarVersion}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
- <version>0.8.1</version>
+ <version>${paxWebJettyBundleVersion}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
- <version>0.8.1</version>
+ <version>${paxWebJspVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>2.0.0</version>
+ <version>${geronimoJ2eeConnector15SpecVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <version>${geronimoServletVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>${geronimoJsp21SpecVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
@@ -132,12 +244,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>${javaxServletVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.5.3.0_1</version>
+ <version>${derbyVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
@@ -152,52 +264,59 @@
<dependency>
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
- <version>1.13.1</version>
+ <version>${serpVersion}</version>
</dependency>
<!-- bundle version of serp necessary for equinox assembly using openjpa -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>1.13.1_2</version>
+ <version>${servicemixBundlesSerpVersion}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>${commonsLangVersion}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
+ <version>${commonsPoolVersion}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>${commonsCollectionsVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>2.1_3_4</version>
+ <version>${servicemixBundlesCglibVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.1.4</version>
+ <version>${felixFileinstallVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.6.4</version>
+ <version>${felixBundlerepositoryVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.homeip.yusuke</groupId>
+ <artifactId>twitter4j</artifactId>
+ <version>${twitter4jVersion}</version>
</dependency>
+
<!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
<!-- other aries subproject dependency management -->
<!--application-->
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
@@ -207,93 +326,93 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.converters</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationConvertersVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationDefaultLocalPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationDeploymentManagementVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationInstallVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationManagementVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationModellerVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.noop</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationNoopResolverVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationObrResolverVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationRuntimeVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationRuntimeFrameworkVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationRuntimeFrameworkManagementVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.isolated</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationRuntimeIsolatedVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationItestInterfaceVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.repository</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationRuntimeRepositoryVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <version>${ariesApplicationVersion}</version>
+ <version>${ariesApplicationUtilsVersion}</version>
</dependency>
<!-- blueprint -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${ariesBlueprintAnnotationApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${ariesBlueprintAnnotationImplVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${ariesBlueprintApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -303,33 +422,33 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${ariesBlueprintCmVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${ariesBlueprintVersion}</version>
+ <version>${ariesBlueprintCoreVersion}</version>
</dependency>
<!-- jmx -->
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxBlueprintApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxBlueprintVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxBlueprintCoreVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
@@ -339,18 +458,18 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxCoreVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
- <version>${ariesJmxVersion}</version>
+ <version>${ariesJmxWhiteboardVersion}</version>
</dependency>
<!-- jndi -->
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
- <version>${ariesJndiVersion}</version>
+ <version>${ariesJndiApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
@@ -360,49 +479,49 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>${ariesJndiVersion}</version>
+ <version>${ariesJndiCoreVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.legacy.support</artifactId>
- <version>${ariesJndiVersion}</version>
+ <version>${ariesJndiLegacySupportVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>${ariesJndiVersion}</version>
+ <version>${ariesJndiRmiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>${ariesJndiVersion}</version>
+ <version>${ariesJndiUrlVersion}</version>
</dependency>
<!-- jpa -->
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
- <version>${ariesJpaVersion}</version>
+ <version>${ariesJpaApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>${ariesJpaVersion}</version>
+ <version>${ariesJpaBlueprintAriesVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
- <version>${ariesJpaVersion}</version>
+ <version>${ariesJpaContainerVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
- <version>${ariesJpaVersion}</version>
+ <version>${ariesJpaContainerContextVersion}</version>
</dependency>
<!-- proxy -->
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>${ariesProxyVersion}</version>
+ <version>${ariesProxyApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -412,39 +531,45 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>${ariesProxyVersion}</version>
+ <version>${ariesProxyImplVersion}</version>
</dependency>
<!-- quiesce -->
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>${ariesQuiesceVersion}</version>
+ <version>${ariesQuiesceApiVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
- <version>${ariesQuiesceVersion}</version>
+ <version>${ariesQuiesceManagerVersion}</version>
+ </dependency>
+ <!-- Testsupport -->
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>${ariesTestsupportUnitVersion}</version>
</dependency>
<!-- transaction -->
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
- <version>${ariesTransactionVersion}</version>
+ <version>${ariesTransactionBlueprintVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>${ariesTransactionVersion}</version>
+ <version>${ariesTransactionManagerVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.testds</artifactId>
- <version>${ariesTransactionVersion}</version>
+ <version>${ariesTransactionTestdsVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.wrappers</artifactId>
- <version>${ariesTransactionVersion}</version>
+ <version>${ariesTransactionWrappersVersion}</version>
</dependency>
<!--util-->
<dependency>
@@ -479,11 +604,9 @@
</dependencyManagement>
<modules>
- <!--
<module>blog</module>
<module>ariestrader</module>
<module>blueprint</module>
- -->
<module>twitter</module>
</modules>
Modified: aries/trunk/samples/twitter/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/twitter/pom.xml (original)
+++ aries/trunk/samples/twitter/pom.xml Sun Mar 20 13:13:44 2011
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.aries.samples.twitter</groupId>
<artifactId>org.apache.aries.samples.twitter.twitter4j</artifactId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.twitter</groupId>
Modified: aries/trunk/samples/twitter/twitter-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-bundle/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-bundle/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-bundle/pom.xml Sun Mar 20 13:13:44 2011
@@ -38,12 +38,10 @@
<dependency>
<groupId>net.homeip.yusuke</groupId>
<artifactId>twitter4j</artifactId>
- <version>2.0.8</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/samples/twitter/twitter-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-itests/pom.xml Sun Mar 20 13:13:44 2011
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -63,7 +62,6 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
- <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -116,7 +114,6 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
- <version>0.3</version>
</dependency>
<dependency>
@@ -185,13 +182,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
- <version>3.5.0.v20090520</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Added: aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml?rev=1083440&view=auto
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml (added)
+++ aries/trunk/samples/twitter/twitter-itests/src/test/filtered-resources/obr/twitter/TwitterRepository.xml Sun Mar 20 13:13:44 2011
@@ -0,0 +1,151 @@
+<?xml version='1.0' encoding='utf-8'?>
+<?xml-stylesheet type='text/xsl' href='http://www2.osgi.org/www/obr2html.xsl'?>
+
+<repository lastmodified='20101105121848.125' name='Untitled'>
+ <resource id='org.apache.commons.lang/${commonsLangVersion}' presentationname='Commons Lang' symbolicname='org.apache.commons.lang' uri='commons.lang.location' version='${commonsLangVersion}'>
+ <description>
+ Commons Lang, a package of Java utility classes for the
+ classes that are in java.lang's hierarchy, or are considered
+ to be so standard as to justify existence in java.lang.
+ </description>
+ <size>
+ 261809
+ </size>
+ <license>
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ </license>
+ <documentation>
+ http://commons.apache.org/lang/
+ </documentation>
+ <capability name='bundle'>
+ <p n='manifestversion' v='2'/>
+ <p n='presentationname' v='Commons Lang'/>
+ <p n='symbolicname' v='org.apache.commons.lang'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.math'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.enums'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.builder'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.exception'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.enum'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.mutable'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.text'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang.time'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='org.apache.commons.lang'/>
+ <p n='version' t='version' v='${commonsLangVersion}'/>
+ </capability>
+ <require extend='false' filter='(&(package=org.apache.commons.lang)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.builder)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.builder ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.enum)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.enum ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.enums)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.enums ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.exception)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.exception ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.math)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.math ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.mutable)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.mutable ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.text)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.text ;version=${commonsLangVersion}
+ </require>
+ <require extend='false' filter='(&(package=org.apache.commons.lang.time)(version>=${commonsLangVersion}))' multiple='false' name='package' optional='false'>
+ Import package org.apache.commons.lang.time ;version=${commonsLangVersion}
+ </require>
+ </resource>
+ <resource id='twitter4j/${twitter4jVersion}' presentationname='Apache Aries Application Bundlise Twitter4j' symbolicname='twitter4j' uri='twitter4j.location' version='${twitter4jVersion}'>
+ <description>
+ Application used to bundlelise twitter4j
+ </description>
+ <size>
+ 257233
+ </size>
+ <license>
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ </license>
+ <documentation>
+ http://www.apache.org
+ </documentation>
+ <capability name='bundle'>
+ <p n='manifestversion' v='2'/>
+ <p n='presentationname' v='Apache Aries Application Bundlise Twitter4j'/>
+ <p n='symbolicname' v='twitter4j'/>
+ <p n='version' t='version' v='${twitter4jVersion}'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='twitter4j'/>
+ <p n='uses' v='javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,javax.xml.transform'/>
+ <p n='version' t='version' v='${twitter4jVersion}'/>
+ </capability>
+ <require extend='false' filter='(&(package=com.sun.syndication.feed.synd)(version>=0.0.0))' multiple='false' name='package' optional='true'>
+ Import package com.sun.syndication.feed.synd
+ </require>
+ <require extend='false' filter='(&(package=com.sun.syndication.io)(version>=0.0.0))' multiple='false' name='package' optional='true'>
+ Import package com.sun.syndication.io
+ </require>
+ <require extend='false' filter='(&(package=javax.crypto)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.crypto
+ </require>
+ <require extend='false' filter='(&(package=javax.crypto.spec)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.crypto.spec
+ </require>
+ <require extend='false' filter='(&(package=javax.xml.parsers)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.xml.parsers
+ </require>
+ <require extend='false' filter='(&(package=javax.xml.transform)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform
+ </require>
+ <require extend='false' filter='(&(package=javax.xml.transform.dom)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform.dom
+ </require>
+ <require extend='false' filter='(&(package=javax.xml.transform.stream)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform.stream
+ </require>
+ <require extend='false' filter='(&(package=org.slf4j)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package org.slf4j
+ </require>
+ <require extend='false' filter='(&(package=org.w3c.dom)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package org.w3c.dom
+ </require>
+ <require extend='false' filter='(&(package=org.xml.sax)(version>=0.0.0))' multiple='false' name='package' optional='false'>
+ Import package org.xml.sax
+ </require>
+ <require extend='false' filter='(&(package=twitter4j)(version>=${twitter4jVersion}))' multiple='false' name='package' optional='false'>
+ Import package twitter4j ;version=${twitter4jVersion}
+ </require>
+ </resource>
+</repository>
Modified: aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java (original)
+++ aries/trunk/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java Sun Mar 20 13:13:44 2011
@@ -165,4 +165,4 @@ public class TwitterTest extends Abstrac
options = updateOptions(options);
return options;
}
-}
\ No newline at end of file
+}
Modified: aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-twitter4j/pom.xml?rev=1083440&r1=1083439&r2=1083440&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-twitter4j/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-twitter4j/pom.xml Sun Mar 20 13:13:44 2011
@@ -26,7 +26,6 @@
<artifactId>org.apache.aries.samples.twitter.twitter4j</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Bundlise Twitter4j</name>
- <version>2.0.8-SNAPSHOT</version>
<description>
Module used to bundlelise twitter4j
</description>
@@ -34,7 +33,6 @@
<dependency>
<groupId>net.homeip.yusuke</groupId>
<artifactId>twitter4j</artifactId>
- <version>2.0.8</version>
</dependency>
</dependencies>
<build>