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/26 14:01:16 UTC
svn commit: r1085716 - in /aries/trunk/samples/ariestrader: assemblies/
assemblies/ariestrader-all-eba/ assemblies/ariestrader-jdbc-eba/ modules/
modules/ariestrader-api/
modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/
m...
Author: zoe
Date: Sat Mar 26 13:01:15 2011
New Revision: 1085716
URL: http://svn.apache.org/viewvc?rev=1085716&view=rev
Log:
ARIES-617 Ariestrader, packageinfo and build warnings
Added:
aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/packageinfo
aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/packageinfo
aries/trunk/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/packageinfo
aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/packageinfo
aries/trunk/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/packageinfo
Modified:
aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
aries/trunk/samples/ariestrader/assemblies/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml
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-jdbc/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/ariestrader/modules/ariestrader-util/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
aries/trunk/samples/ariestrader/modules/pom.xml
Modified: aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml Sat Mar 26 13:01:15 2011
@@ -75,11 +75,12 @@
<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/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml Sat Mar 26 13:01:15 2011
@@ -63,11 +63,12 @@
<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/ariestrader/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/pom.xml Sat Mar 26 13:01:15 2011
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>eba</type>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>eba</type>
</dependency>
</dependencies>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml Sat Mar 26 13:01:15 2011
@@ -24,6 +24,19 @@
<version>0.3.1-SNAPSHOT</version>
</parent>
+
+ <properties>
+ <!-- Export versions handled in packageinfo. Override settings in default parent which cause build warnings -->
+ <aries.osgi.export>
+ org.apache.aries.samples.ariestrader.api,
+ org.apache.aries.samples.ariestrader.api.persistence
+ </aries.osgi.export>
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg />
+ </properties>
+
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.api</artifactId>
<packaging>bundle</packaging>
@@ -38,23 +51,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Export-Package>
- org.apache.aries.samples.ariestrader.api;
- org.apache.aries.samples.ariestrader.api.persistence;
- version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Added: aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/packageinfo?rev=1085716&view=auto
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/packageinfo (added)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/packageinfo Sat Mar 26 13:01:15 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 1.0.0
Added: aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/packageinfo?rev=1085716&view=auto
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/packageinfo (added)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/packageinfo Sat Mar 26 13:01:15 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 1.0.0
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml Sat Mar 26 13:01:15 2011
@@ -30,6 +30,18 @@
<name>AriesTrader :: Modules - Beans</name>
<description>AriesTrader UnEnhanced Enttities Module</description>
+
+ <properties>
+ <!-- Export package versions handled with packageinfo. Override settings in default parent which cause build warnings -->
+ <aries.osgi.export>
+ org.apache.aries.samples.ariestrader.beans
+ </aries.osgi.export>
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
@@ -42,21 +54,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Export-Package>
- org.apache.aries.samples.ariestrader.beans;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
Added: aries/trunk/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/packageinfo?rev=1085716&view=auto
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/packageinfo (added)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/packageinfo Sat Mar 26 13:01:15 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 1.0.0
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml Sat Mar 26 13:01:15 2011
@@ -50,8 +50,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Private-Package>org.apache.aries.samples.ariestrader.core.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.core.*</Export-Package>
</instructions>
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=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml Sat Mar 26 13:01:15 2011
@@ -23,13 +23,20 @@
<artifactId>modules</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.derby.ds</artifactId>
<packaging>bundle</packaging>
<name>AriesTrader :: Modules - Derby DataSource</name>
<description>AriesTrader Derby DataSource</description>
+ <properties>
+ <aries.osgi.export.pkg />
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg />
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -45,18 +52,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
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=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml Sat Mar 26 13:01:15 2011
@@ -30,6 +30,13 @@
<name>AriesTrader :: Modules - Entities</name>
<description>AriesTrader JPA Enhanced Entities Module</description>
+
+
+ <properties>
+ <!-- Override settings in default parent which cause build warnings -->
+ <aries.osgi.private.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
@@ -111,11 +118,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
<Export-Package>
- org.apache.aries.samples.ariestrader.entities;version=${pom.version}
+ org.apache.aries.samples.ariestrader.entities
</Export-Package>
<Import-Package>
org.apache.openjpa.enhance;version="[1.0.0,2.1.0)",
Added: aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/packageinfo?rev=1085716&view=auto
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/packageinfo (added)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/packageinfo Sat Mar 26 13:01:15 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 1.0.0
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml Sat Mar 26 13:01:15 2011
@@ -55,8 +55,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Private-Package>org.apache.aries.samples.ariestrader.persist.jdbc.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jdbc.*</Export-Package>
</instructions>
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=1085716&r1=1085715&r2=1085716&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 Sat Mar 26 13:01:15 2011
@@ -60,8 +60,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Private-Package>org.apache.aries.samples.ariestrader.persist.jpa.am.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jpa.am.*</Export-Package>
<Import-Package>
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=1085716&r1=1085715&r2=1085716&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 Sat Mar 26 13:01:15 2011
@@ -60,8 +60,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Private-Package>org.apache.aries.samples.ariestrader.persist.jpa.cm.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jpa.cm.*</Export-Package>
<Import-Package>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml Sat Mar 26 13:01:15 2011
@@ -30,6 +30,18 @@
<name>AriesTrader :: Modules - Util</name>
<description>AriesTrader Util Module</description>
+
+ <properties>
+ <!-- Export versions handled with packageinfo files. Override settings in default parent which cause build warnings -->
+ <aries.osgi.export>
+ org.apache.aries.samples.ariestrader.util
+ </aries.osgi.export>
+ <aries.osgi.import>
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -38,21 +50,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Export-Package>
- org.apache.aries.samples.ariestrader.util;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Added: aries/trunk/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/packageinfo?rev=1085716&view=auto
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/packageinfo (added)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/packageinfo Sat Mar 26 13:01:15 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 1.0.0
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml Sat Mar 26 13:01:15 2011
@@ -68,8 +68,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
<Web-ContextPath>/ariestrader</Web-ContextPath>
<Web-JSPExtractLocation>/</Web-JSPExtractLocation>
<Private-Package>org.apache.aries.samples.ariestrader.web.*</Private-Package>
Modified: aries/trunk/samples/ariestrader/modules/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/pom.xml?rev=1085716&r1=1085715&r2=1085716&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/pom.xml Sat Mar 26 13:01:15 2011
@@ -35,52 +35,52 @@
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.beans</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.derby.ds</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.entities</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.persist.jdbc</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.persist.jpa.am</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.persist.jpa.cm</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.util</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.web</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>