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/11 10:58:15 UTC
svn commit: r1080501 - in /aries/trunk/jpa: jpa-api/
jpa-api/src/main/java/org/apache/aries/jpa/container/
jpa-api/src/main/java/org/apache/aries/jpa/container/context/
jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/
jpa-blueprint-aries/ ...
Author: zoe
Date: Fri Mar 11 09:58:15 2011
New Revision: 1080501
URL: http://svn.apache.org/viewvc?rev=1080501&view=rev
Log:
ARIES-598 Update JPA maven bundle configuration and use packageinfo
Added:
aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo
aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo
aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo
aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo
aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo
Modified:
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-blueprint-aries/pom.xml
aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container-testbundle/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Fri Mar 11 09:58:15 2011
@@ -27,6 +27,22 @@
<artifactId>org.apache.aries.jpa.api</artifactId>
<packaging>bundle</packaging>
<name>Aries JPA Container API</name>
+
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg>
+ org.apache.aries.jpa.container.parsing,
+ org.apache.aries.jpa.container,
+ org.apache.aries.jpa.container.context
+ </aries.osgi.export.pkg>
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,2.1.0)",
+ javax.persistence.spi;version="[1.0.0,2.1.0)",
+ org.osgi.framework;version="[1.5.0,2.0.0)",
+ </aries.osgi.import>
+ </properties>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -45,31 +61,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,2.1.0)",
- javax.persistence.spi;version="[1.0.0,2.1.0)",
- org.osgi.framework;version="[1.5.0,2.0.0)",
- </Import-Package>
- <Export-Package>
- org.apache.aries.jpa.container.parsing;version="${pom.version}",
- org.apache.aries.jpa.container;version="${pom.version}",
- org.apache.aries.jpa.container.context;version="${pom.version}"
- </Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Added: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo?rev=1080501&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo (added)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo Fri Mar 11 09:58: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 0.4.0
Added: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo?rev=1080501&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo (added)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo Fri Mar 11 09:58: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 0.4.0
Added: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo?rev=1080501&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo (added)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo Fri Mar 11 09:58: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 0.4.0
Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Fri Mar 11 09:58:15 2011
@@ -28,6 +28,22 @@
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
<packaging>bundle</packaging>
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg />
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,3.0.0)",
+ org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
+ org.apache.aries.blueprint;version="[0.1.0,1.1.0)",
+ *
+ </aries.osgi.import>
+ <aries.osgi.export.service>
+ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
+ </aries.osgi.export.service>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -74,29 +90,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,3.0.0)",
- org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
- org.apache.aries.blueprint;version="[0.1.0,1.1.0)",
- *
- </Import-Package>
- <Export-Service>
- org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
- </Export-Service>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml Fri Mar 11 09:58:15 2011
@@ -28,6 +28,19 @@
<packaging>bundle</packaging>
<name>Test Bundle for Aries JPA Blueprint iTests</name>
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg>
+ org.apache.aries.jpa.blueprint.itest*,
+ </aries.osgi.export.pkg>
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,3.0.0)",
+ *
+ </aries.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -35,7 +48,6 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -43,16 +55,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,3.0.0)",
- *
- </Import-Package>
- <Export-Package>
- org.apache.aries.jpa.blueprint.itest*;version="${pom.version}",
- </Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
<Meta-Persistence>OSGI-INF/persistence/persistence.xml</Meta-Persistence>
</instructions>
</configuration>
Added: aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo?rev=1080501&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo (added)
+++ aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo Fri Mar 11 09:58: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 0.4.0
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Fri Mar 11 09:58:15 2011
@@ -29,6 +29,20 @@
<packaging>bundle</packaging>
<properties>
+
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg/>
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,2.1.0)",
+ javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
+ javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
+ org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
+ org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
+ org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+ *
+ </aries.osgi.import>
<aries.osgi.activator>
org.apache.aries.jpa.container.context.impl.GlobalPersistenceManager
</aries.osgi.activator>
@@ -92,30 +106,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,2.1.0)",
- javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
- javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
- org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
- org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
- org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
- *
- </Import-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: aries/trunk/jpa/jpa-container-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-testbundle/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-testbundle/pom.xml Fri Mar 11 09:58:15 2011
@@ -27,6 +27,23 @@
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
<packaging>bundle</packaging>
<name>Test Bundle for Aries JPA Container iTests</name>
+
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg>
+ org.apache.aries.jpa.container.itest.entities
+ </aries.osgi.export.pkg>
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,3.0.0)",
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg>
+ org.apache.aries.jpa.container.itest
+ </aries.osgi.private.pkg>
+ <aries.osgi.symbolic.name>${project.groupId}.${project.artifactId}</aries.osgi.symbolic.name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -47,17 +64,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,3.0.0)",
- *
- </Import-Package>
- <Export-Package>
- org.apache.aries.jpa.container.itest.entities;version="${pom.version}",
- </Export-Package>
- <Private-Package>org.apache.aries.jpa.container.itest</Private-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
</instructions>
</configuration>
Added: aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo?rev=1080501&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo (added)
+++ aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo Fri Mar 11 09:58: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 0.4.0
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1080501&r1=1080500&r2=1080501&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Mar 11 09:58:15 2011
@@ -29,6 +29,21 @@
<name>Aries JPA Container</name>
<properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+
+ <aries.osgi.export.pkg />
+ <aries.osgi.import>
+ javax.persistence;version="[1.0.0,2.1.0)",
+ javax.persistence.spi;version="[1.0.0,2.1.0)",
+ javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
+ javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
+ org.apache.aries.jpa.container;version="[0.1.0,1.1.0)",
+ org.apache.aries.jpa.container.parsing;version="[0.1.0,1.1.0)",
+ org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
+ org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
+ *
+ </aries.osgi.import>
<aries.osgi.activator>
org.apache.aries.jpa.container.impl.PersistenceBundleManager
</aries.osgi.activator>
@@ -86,32 +101,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>
- javax.persistence;version="[1.0.0,2.1.0)",
- javax.persistence.spi;version="[1.0.0,2.1.0)",
- javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
- javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
- org.apache.aries.jpa.container;version="[0.1.0,1.1.0)",
- org.apache.aries.jpa.container.parsing;version="[0.1.0,1.1.0)",
- org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
- org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
- *
- </Import-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>