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/25 14:53:48 UTC
svn commit: r1085365 - in /aries/trunk: samples-sandbox/goat/
samples-sandbox/goat/goat-api/ samples-sandbox/goat/goat-assembly/
samples-sandbox/goat/goat-bundlecontext-modelprovider/
samples-sandbox/goat/goat-dummy-provider/ samples-sandbox/goat/goat-...
Author: zoe
Date: Fri Mar 25 13:53:47 2011
New Revision: 1085365
URL: http://svn.apache.org/viewvc?rev=1085365&view=rev
Log:
ARIES-616 Move Goat and fix build warnings
Added:
aries/trunk/samples-sandbox/goat/
- copied from r1084962, aries/trunk/samples/goat/
Removed:
aries/trunk/samples/goat/
Modified:
aries/trunk/samples-sandbox/goat/goat-api/pom.xml
aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml
aries/trunk/samples-sandbox/goat/goat-bundlecontext-modelprovider/pom.xml
aries/trunk/samples-sandbox/goat/goat-dummy-provider/pom.xml
aries/trunk/samples-sandbox/goat/goat-dummy2-provider/pom.xml
aries/trunk/samples-sandbox/goat/goat-eba/pom.xml
aries/trunk/samples-sandbox/goat/goat-info-enhancer/pom.xml
aries/trunk/samples-sandbox/goat/goat-web/pom.xml
aries/trunk/samples-sandbox/goat/pom.xml
aries/trunk/samples/blog/blog-api/pom.xml
aries/trunk/samples/blog/blog-biz/pom.xml
aries/trunk/samples/blog/blog-datasource/pom.xml
aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
aries/trunk/samples/blog/blog-jpa-eba/pom.xml
aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml
aries/trunk/samples/blog/blog-persistence-jpa/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
aries/trunk/samples/pom.xml
Modified: aries/trunk/samples-sandbox/goat/goat-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-api/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-api/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-api/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,13 +21,26 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.api</artifactId>
<name>Apache Aries GOAT api</name>
<packaging>bundle</packaging>
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg>
+ org.apache.aries.samples.goat.api,
+ org.apache.aries.samples.goat.info
+ </aries.osgi.export.pkg>
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg />
+ </properties>
+
+<!--
<build>
<plugins>
<plugin>
@@ -35,7 +48,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.aries.samples.goat.api; version=${project.version},
org.apache.aries.samples.goat.info;version=${project.version} </Export-Package>
</instructions>
@@ -43,5 +56,5 @@
</plugin>
</plugins>
</build>
-
+-->
</project>
Modified: aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-assembly/pom.xml Fri Mar 25 13:53:47 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.assembly</artifactId>
Modified: aries/trunk/samples-sandbox/goat/goat-bundlecontext-modelprovider/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-bundlecontext-modelprovider/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-bundlecontext-modelprovider/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-bundlecontext-modelprovider/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.bundlecontextmodel</artifactId>
@@ -39,22 +39,15 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.aries.samples.goat.bundlecontextmodel.*</Private-Package>
- <Export-Package>!org.apache.aries.samples.goat.bundlecontextmodel.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg />
+ <aries.osgi.import> *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg >
+ org.apache.aries.samples.goat.bundlecontextmodel.*
+ </aries.osgi.private.pkg>
+ </properties>
+
</project>
Modified: aries/trunk/samples-sandbox/goat/goat-dummy-provider/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-dummy-provider/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-dummy-provider/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-dummy-provider/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.dummy</artifactId>
@@ -35,22 +35,15 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.aries.samples.goat.dummy.*</Private-Package>
- <Export-Package>!org.apache.aries.samples.goat.dummy.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg />
+ <aries.osgi.import> *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg >
+ org.apache.aries.samples.goat.dummy.*
+ </aries.osgi.private.pkg>
+ </properties>
</project>
Modified: aries/trunk/samples-sandbox/goat/goat-dummy2-provider/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-dummy2-provider/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-dummy2-provider/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-dummy2-provider/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.dummy2</artifactId>
@@ -40,21 +40,14 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.aries.samples.goat.dummy2.*</Private-Package>
- <Export-Package>!org.apache.aries.samples.goat.dummy2.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg />
+ <aries.osgi.import> *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg >
+ org.apache.aries.samples.goat.dummy2.*
+ </aries.osgi.private.pkg>
+ </properties>
</project>
Modified: aries/trunk/samples-sandbox/goat/goat-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-eba/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-eba/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-eba/pom.xml Fri Mar 25 13:53:47 2011
@@ -24,9 +24,9 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples</groupId>
- <artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries.samples.goat</groupId>
+ <artifactId>goat</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.goat</groupId>
@@ -75,11 +75,12 @@ under the License.
<plugin>
<groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
+ <version>${ariesEbaMavenPluginVersion}</version>
<extensions>true</extensions>
<configuration>
<generateManifest>true</generateManifest>
<instructions>
- <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ <Application-SymbolicName>${project.artifactId}</Application-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples-sandbox/goat/goat-info-enhancer/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-info-enhancer/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-info-enhancer/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-info-enhancer/pom.xml Fri Mar 25 13:53:47 2011
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.info.enhancer</artifactId>
@@ -25,38 +25,29 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.apache.aries.samples.goat.api</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.apache.aries.samples.goat.web</artifactId>
</dependency>
</dependencies>
<properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg />
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg>
+ org.apache.aries.samples.goat.enhancer.*
+ </aries.osgi.private.pkg>
<aries.osgi.activator>
org.apache.aries.samples.goat.enhancer.Activator
</aries.osgi.activator>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.aries.samples.goat.enhancer.*</Private-Package>
- <Export-Package>!org.apache.aries.samples.goat.enhancer.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: aries/trunk/samples-sandbox/goat/goat-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/goat-web/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/goat-web/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/goat-web/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>goat</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.goat.web</artifactId>
@@ -91,7 +91,7 @@
<Bundle-ClassPath>.,WEB-INF/lib</Bundle-ClassPath>
<Include-Resource>{maven-resources},target/dojo/dojo-1.4.2</Include-Resource>
<Web-ContextPath>/goat</Web-ContextPath>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.goat.web.*</Private-Package>
<Import-Package>
org.apache.aries.samples.goat.info,
Modified: aries/trunk/samples-sandbox/goat/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/goat/pom.xml?rev=1085365&r1=1084962&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/goat/pom.xml (original)
+++ aries/trunk/samples-sandbox/goat/pom.xml Fri Mar 25 13:53:47 2011
@@ -21,7 +21,8 @@
<parent>
<groupId>org.apache.aries.samples</groupId>
<artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
+ <relativePath>../../samples</relativePath>
</parent>
<groupId>org.apache.aries.samples.goat</groupId>
@@ -62,7 +63,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.apache.aries.samples.goat.info.enhancer</artifactId>
<version>${project.version}</version>
</dependency>
Modified: aries/trunk/samples/blog/blog-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-api/pom.xml (original)
+++ aries/trunk/samples/blog/blog-api/pom.xml Fri Mar 25 13:53:47 2011
@@ -36,7 +36,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.apache.aries.samples.blog.api;
org.apache.aries.samples.blog.api.comment.persistence;
Modified: aries/trunk/samples/blog/blog-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-biz/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-biz/pom.xml (original)
+++ aries/trunk/samples/blog/blog-biz/pom.xml Fri Mar 25 13:53:47 2011
@@ -42,7 +42,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.biz.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.biz.*</Export-Package>
</instructions>
Modified: aries/trunk/samples/blog/blog-datasource/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-datasource/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-datasource/pom.xml (original)
+++ aries/trunk/samples/blog/blog-datasource/pom.xml Fri Mar 25 13:53:47 2011
@@ -66,7 +66,7 @@
<Private-Package>
org.apache.aries.samples.blog.datasource
</Private-Package>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jdbc-eba/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jdbc-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jdbc-eba/pom.xml Fri Mar 25 13:53:47 2011
@@ -67,7 +67,7 @@ under the License.
<configuration>
<generateManifest>true</generateManifest>
<instructions>
- <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ <Application-SymbolicName>${project.artifactId}</Application-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blog/blog-jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jpa-eba/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jpa-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jpa-eba/pom.xml Fri Mar 25 13:53:47 2011
@@ -67,7 +67,7 @@ under the License.
<configuration>
<generateManifest>true</generateManifest>
<instructions>
- <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ <Application-SymbolicName>${project.artifactId}</Application-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml (original)
+++ aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml Fri Mar 25 13:53:47 2011
@@ -49,7 +49,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.persistence.jdbc.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.persistence.jdbc*</Export-Package>
</instructions>
Modified: aries/trunk/samples/blog/blog-persistence-jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-persistence-jpa/pom.xml (original)
+++ aries/trunk/samples/blog/blog-persistence-jpa/pom.xml Fri Mar 25 13:53:47 2011
@@ -37,7 +37,7 @@
<configuration>
<instructions>
<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.persistence.jpa.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.persistence.jpa.*</Export-Package>
</instructions>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml Fri Mar 25 13:53:47 2011
@@ -55,6 +55,7 @@ under the License.
<plugin>
<groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
+ <version>${ariesEbaMavenPluginVersion}</version>
<extensions>true</extensions>
<configuration>
<generateManifest>true</generateManifest>
Modified: aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1085365&r1=1085364&r2=1085365&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Fri Mar 25 13:53:47 2011
@@ -45,6 +45,9 @@
-->
<properties>
+ <!-- Aries eba-maven-plugin Version -->
+ <ariesEbaMavenPluginVersion>0.3.1-SNAPSHOT</ariesEbaMavenPluginVersion>
+
<!-- Aries Application Versions -->
<ariesApplicationApiVersion>0.3.1-SNAPSHOT</ariesApplicationApiVersion>
<ariesApplicationVersion>0.3.1-SNAPSHOT</ariesApplicationVersion>