aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1085702 - in /aries/trunk/samples/blog: blog-api/ blog-api/src/main/java/org/apache/aries/samples/blog/api/ blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/ blog-api/src/main/java/org/apache/aries/samples/blog/...
Date Sat, 26 Mar 2011 11:37:24 GMT
Author: zoe
Date: Sat Mar 26 11:37:24 2011
New Revision: 1085702

URL: http://svn.apache.org/viewvc?rev=1085702&view=rev
Log:
ARIES-617 Blog sample done

Added:
    aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/packageinfo
    aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/packageinfo
    aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/persistence/packageinfo
Modified:
    aries/trunk/samples/blog/blog-api/pom.xml
    aries/trunk/samples/blog/blog-assembly/pom.xml
    aries/trunk/samples/blog/blog-biz/pom.xml
    aries/trunk/samples/blog/blog-datasource/pom.xml
    aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml

Modified: aries/trunk/samples/blog/blog-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/pom.xml?rev=1085702&r1=1085701&r2=1085702&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-api/pom.xml (original)
+++ aries/trunk/samples/blog/blog-api/pom.xml Sat Mar 26 11:37:24 2011
@@ -29,23 +29,17 @@
     <name>Apache Aries blog sample API</name>
     <packaging>bundle</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-						<Export-Package>
-							org.apache.aries.samples.blog.api;
-							org.apache.aries.samples.blog.api.comment.persistence;
-							org.apache.aries.samples.blog.api.persistence;
-								version=${project.version}
-						</Export-Package>
-					</instructions>
-				</configuration> 
-            </plugin>
-        </plugins>
-    </build>
+    <properties>
+         <!-- Export package versions are maintained in packageinfo files -->
+         <aries.osgi.export.pkg>
+              org.apache.aries.samples.blog.api,
+              org.apache.aries.samples.blog.api.comment.persistence,
+              org.apache.aries.samples.blog.api.persistence,
+         </aries.osgi.export.pkg>
+         <aries.osgi.import>
+               *
+         </aries.osgi.import>
+         <aries.osgi.private.pkg />
+    </properties>
+
 </project>

Added: aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/packageinfo?rev=1085702&view=auto
==============================================================================
--- aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/packageinfo
(added)
+++ aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/comment/persistence/packageinfo
Sat Mar 26 11:37:24 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/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/packageinfo?rev=1085702&view=auto
==============================================================================
--- aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/packageinfo
(added)
+++ aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/packageinfo
Sat Mar 26 11:37:24 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/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/persistence/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/persistence/packageinfo?rev=1085702&view=auto
==============================================================================
--- aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/persistence/packageinfo
(added)
+++ aries/trunk/samples/blog/blog-api/src/main/java/org/apache/aries/samples/blog/api/persistence/packageinfo
Sat Mar 26 11:37:24 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/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1085702&r1=1085701&r2=1085702&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ aries/trunk/samples/blog/blog-assembly/pom.xml Sat Mar 26 11:37:24 2011
@@ -203,6 +203,7 @@
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
          </dependency>
+
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.noop</artifactId>

Modified: aries/trunk/samples/blog/blog-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-biz/pom.xml?rev=1085702&r1=1085701&r2=1085702&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-biz/pom.xml (original)
+++ aries/trunk/samples/blog/blog-biz/pom.xml Sat Mar 26 11:37:24 2011
@@ -28,6 +28,17 @@
 	<name>Apache Aries blog sample </name>
 	<packaging>bundle</packaging>
 
+    <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.blog.biz.*
+         </aries.osgi.private.pkg>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.samples.blog</groupId>
@@ -35,20 +46,5 @@
         </dependency>
     </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-                        <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>
-				</configuration> 
-			</plugin>
-		</plugins>
-	</build>
 </project>
 	

Modified: aries/trunk/samples/blog/blog-datasource/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-datasource/pom.xml?rev=1085702&r1=1085701&r2=1085702&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-datasource/pom.xml (original)
+++ aries/trunk/samples/blog/blog-datasource/pom.xml Sat Mar 26 11:37:24 2011
@@ -28,6 +28,19 @@
   <artifactId>org.apache.aries.samples.blog.datasource</artifactId>
   <name>Apache Aries blog sample transaction enlisting JDBC datasource</name>
   <packaging>bundle</packaging>
+
+
+    <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.blog.datasource
+         </aries.osgi.private.pkg>
+    </properties>
+
   <dependencies>
         <dependency>
           <groupId>org.apache.derby</groupId>
@@ -42,6 +55,7 @@
             <artifactId>geronimo-transaction</artifactId>
         </dependency>
   </dependencies>
+
   <build>
    <resources>
         <resource>
@@ -53,23 +67,5 @@
             </includes>
         </resource>
     </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            *
-                        </Import-Package>
-                        <Private-Package>
-                            org.apache.aries.samples.blog.datasource
-                        </Private-Package>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
   </build>
 </project>

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=1085702&r1=1085701&r2=1085702&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml (original)
+++ aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml Sat Mar 26 11:37:24 2011
@@ -30,6 +30,18 @@
     <name>Apache Aries blog sample persistence</name>
     <packaging>bundle</packaging>
 
+
+    <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.blog.persistence.jdbc.*
+         </aries.osgi.private.pkg>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.samples.blog</groupId>
@@ -42,21 +54,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <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>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
 	



Mime
View raw message