aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1606837 [20/27] - in /aries/branches/subsystemsR6: ./ application/ application/application-api/ application/application-bundle/ application/application-converters/ application/application-default-local-platform/ application/application-dep...
Date Mon, 30 Jun 2014 16:55:06 GMT
Modified: aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml (original)
+++ aries/branches/subsystemsR6/spi-fly/spi-fly-weaver/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
+<!--
  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
@@ -16,14 +16,16 @@
  KIND, either express or implied.  See the License for the
  specific language governing permissions and limitations
  under the License.
-    -->
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.spifly</groupId>
@@ -37,12 +39,12 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-weaver</developerConnection>
         <url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver</url>
     </scm>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>4.0</version>
+            <artifactId>asm-debug-all</artifactId>
+            <version>5.0.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -65,4 +67,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
 </project>

Modified: aries/branches/subsystemsR6/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,52 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		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.
-	-->
+ 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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath/>
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.apache.aries.subsystem</groupId>
     <artifactId>subsystem</artifactId>
     <name>Apache Aries Subsystem</name>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
     <description>Subsystems support for Aries</description>
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
-		<url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
-	</scm>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>subsystem-api</module>
-                <module>subsystem-core</module>
-		<module>subsystem-obr</module>
-                <module>subsystem-itests</module>
-                <module>subsystem-itests-api-bundle</module>
-		<module>subsystem-bundle</module>
-            </modules>
-        </profile>
-    </profiles>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
+    </scm>
+
+    <modules>
+        <module>subsystem-api</module>
+        <module>subsystem-core</module>
+        <module>subsystem-obr</module>
+        <module>subsystem-itests</module>
+        <module>subsystem-itests-api-bundle</module>
+        <module>subsystem-bundle</module>
+    </modules>
+
 </project>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-api/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -32,17 +35,17 @@
     <version>1.1.0-SNAPSHOT</version>
     <description>Subsystems API.</description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api</url>
+    </scm>
 
     <properties>
-         <!-- Export package versions are maintained in packageinfo files -->
+        <!-- Export package versions are maintained in packageinfo files -->
         <aries.osgi.export.pkg>
-        	org.apache.aries.subsystem,
-        	org.osgi.service.repository,
+            org.apache.aries.subsystem,
+            org.osgi.service.repository,
             org.osgi.service.subsystem
         </aries.osgi.export.pkg>
         <aries.osgi.import>
@@ -53,7 +56,7 @@
     </properties>
 
     <dependencies>
-    	<dependency>
+        <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <version>1.1.0</version>
@@ -70,7 +73,7 @@
             <version>6.0.0</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -83,9 +86,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.subsystem:org.apache.aries.subsystem.api:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo Mon Jun 30 16:54:57 2014
@@ -1,14 +1,19 @@
-/*
- * Licensed 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.
- */
+#
+# 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

Modified: aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo Mon Jun 30 16:54:57 2014
@@ -1 +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.1

Propchange: aries/branches/subsystemsR6/subsystem/subsystem-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 16:54:57 2014
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-bundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -32,29 +35,31 @@
     <version>1.1.0-SNAPSHOT</version>
     <description>This is a standalone bundle to support Aries Subsystems.</description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/application/subsystem-bundle</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/application/subsystem-bundle</url>
+    </scm>
 
     <properties>
-    	<aries.osgi.activator>
+        <aries.osgi.activator>
             org.apache.aries.subsystem.core.internal.Activator
         </aries.osgi.activator>
     	<aries.osgi.import>
-    		org.osgi.service.repository;version="[1.0,1.1)",
-    		org.osgi.service.subsystem;version="[1.1,1.2)",
-    		*
-    	</aries.osgi.import>
+            org.osgi.service.repository;version="[1.0,1.1)",
+            org.osgi.service.subsystem;version="[1.1,1.2)",
+            org.apache.aries.application.*;resolution:=optional,
+            *
+        </aries.osgi.import>
         <aries.osgi.export.pkg>
-        	org.apache.aries.subsystem;version="1.1",
-        	org.osgi.service.repository;version="1.0",
+            org.apache.aries.subsystem;version="1.1",
+            org.osgi.service.repository;version="1.0",
             org.osgi.service.subsystem;version="1.1"
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.*
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -96,7 +101,7 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -104,11 +109,11 @@
             <version>1.0.0</version>
         </dependency>
         <dependency>
-    		<groupId>org.eclipse.equinox</groupId>
-    		<artifactId>org.eclipse.equinox.coordinator</artifactId>
-    		<version>1.1.0.v20120522-1841</version>
-    	</dependency>
-    	<dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.coordinator</artifactId>
+            <version>1.1.0.v20120522-1841</version>
+        </dependency>
+        <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.region</artifactId>
             <version>1.1.0.v20120522-1841</version>
@@ -116,10 +121,10 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.10.0.v20131210-2136</version>
+            <version>3.10.0.v20140606-1445</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <!-- Use the shade plugin with the dependency plugin to unjar the various jars
@@ -142,7 +147,7 @@
                                 </includes>
                             </artifactSet>
                             <filters>
-                                 <filter>
+                                <filter>
                                     <artifact>org.apache.aries.subsystem:org.apache.aries.subsystem.api</artifact>
                                     <excludes>
                                         <exclude>org/**</exclude>
@@ -172,9 +177,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.subsystem:org.apache.aries.subsystem:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -32,73 +35,51 @@
     <version>1.0.1-SNAPSHOT</version>
     <description>Subsystems Core.</description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core</url>
+    </scm>
 
     <properties>
-    	<aries.osgi.activator>
+        <aries.osgi.activator>
             org.apache.aries.subsystem.core.internal.Activator
         </aries.osgi.activator>
     	<aries.osgi.import>
-    		org.osgi.service.subsystem;version="[1.1,1.2)",
-    		org.apache.aries.subsystem;version="[1.1,1.2)",
-    		*
-    	</aries.osgi.import>
-        <aries.osgi.export.pkg />
+            org.osgi.service.subsystem;version="[1.1,1.2)",
+            org.apache.aries.subsystem;version="[1.1,1.2)",
+            org.apache.aries.application.*;resolution:=optional,
+            *
+        </aries.osgi.import>
+        <aries.osgi.export.pkg/>
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.core.*
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
-    	<dependency>
+        <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
             <version>1.1.0-SNAPSHOT</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <version>1.1.0</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
             <version>1.0.0</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.utils</artifactId>
             <version>1.0.0</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>6.0.0</version>
@@ -110,12 +91,12 @@
             <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
-    	<dependency>
-    		<groupId>org.eclipse.equinox</groupId>
-    		<artifactId>org.eclipse.equinox.coordinator</artifactId>
-    		<version>1.1.0.v20120522-1841</version>
-    	</dependency>
-    	<dependency>
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.coordinator</artifactId>
+            <version>1.1.0.v20120522-1841</version>
+        </dependency>
+        <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.region</artifactId>
             <version>1.1.0.v20120522-1841</version>
@@ -126,17 +107,17 @@
             <version>1.0.0</version>
             <scope>test</scope>
             <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-        	<groupId>org.easymock</groupId>
-        	<artifactId>easymock</artifactId>
-        	<version>3.0</version>
-        	<scope>test</scope>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -153,7 +134,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -166,9 +147,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.subsystem:org.apache.aries.subsystem.core:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Activator.java Mon Jun 30 16:54:57 2014
@@ -13,16 +13,12 @@
  */
 package org.apache.aries.subsystem.core.internal;
 
-import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
-import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashSet;
 import java.util.Hashtable;
 
-import org.apache.aries.application.modelling.ModelledResourceManager;
 import org.apache.aries.util.filesystem.IDirectoryFinder;
 import org.eclipse.equinox.region.RegionDigraph;
 import org.osgi.framework.BundleActivator;
@@ -46,9 +42,13 @@ import org.slf4j.LoggerFactory;
  * activator will create and register the SubsystemAdmin service.
  */
 public class Activator implements BundleActivator, ServiceTrackerCustomizer<Object, Object> {
-	private static final Logger logger = LoggerFactory.getLogger(Activator.class);
-	
-	private static Activator instance;
+    private static final Logger logger = LoggerFactory.getLogger(Activator.class);
+    public static final String MODELLED_RESOURCE_MANAGER = "org.apache.aries.application.modelling.ModelledResourceManager";
+
+    public static final String LOG_ENTRY = "Method entry: {}, args {}";
+    public static final String LOG_EXIT = "Method exit: {}, returning {}";
+
+    private static Activator instance;
 	
 	public static synchronized Activator getInstance() {
 		logger.debug(LOG_ENTRY, "getInstance");
@@ -68,7 +68,8 @@ public class Activator implements Bundle
 	private BundleEventHook bundleEventHook;
 	private volatile BundleContext bundleContext;
 	private volatile Coordinator coordinator;
-	private volatile ModelledResourceManager modelledResourceManager;
+    private volatile Object modelledResourceManager;
+    private volatile ServiceModeller serviceModeller;
 	private volatile SubsystemServiceRegistrar registrar;
 	private volatile RegionDigraph regionDigraph;
 	private volatile Resolver resolver;
@@ -87,11 +88,11 @@ public class Activator implements Bundle
 		return coordinator;
 	}
 	
-	public ModelledResourceManager getModelledResourceManager() {
-		return modelledResourceManager;
-	}
-	
-	public RegionDigraph getRegionDigraph() {
+    public ServiceModeller getServiceModeller() {
+        return serviceModeller;
+    }
+
+    public RegionDigraph getRegionDigraph() {
 		return regionDigraph;
 	}
 	
@@ -171,13 +172,13 @@ public class Activator implements Bundle
 		}
 	}
 	
-	private Object findAlternateServiceFor(Object service) {
+	private <T> T findAlternateServiceFor(Class<T> service) {
 		Object[] services = serviceTracker.getServices();
 		if (services == null)
 			return null;
 		for (Object alternate : services)
-			if (alternate.getClass().equals(service.getClass()))
-					return alternate;
+			if (service.isInstance(alternate))
+					return service.cast(alternate);
 		return null;
 	}
 	
@@ -196,7 +197,7 @@ public class Activator implements Bundle
 				.append(org.osgi.framework.Constants.OBJECTCLASS).append('=')
 				.append("org.osgi.service.repository.Repository").append(")(")
 				.append(org.osgi.framework.Constants.OBJECTCLASS).append('=')
-				.append(ModelledResourceManager.class.getName()).append(")(")
+				.append(MODELLED_RESOURCE_MANAGER).append(")(")
 				.append(org.osgi.framework.Constants.OBJECTCLASS).append('=')
 				.append(IDirectoryFinder.class.getName()).append("))").toString();
 	}
@@ -243,10 +244,21 @@ public class Activator implements Bundle
 			regionDigraph = (RegionDigraph) service;
 		else if (service instanceof Resolver && resolver == null)
 			resolver = (Resolver) service;
-		else if (service instanceof ModelledResourceManager && modelledResourceManager == null)
-			modelledResourceManager = (ModelledResourceManager) service;
-		else
-			service = null;
+		else {
+			try {
+				Class clazz = getClass().getClassLoader().loadClass(MODELLED_RESOURCE_MANAGER);
+				if (clazz.isInstance(service) && serviceModeller == null) {
+					modelledResourceManager = service;
+					serviceModeller = new ApplicationServiceModeller(service);
+				} else {
+					service = null;
+				}
+			} catch (ClassNotFoundException e) {
+				service = null;
+			} catch (NoClassDefFoundError e) {
+				service = null;
+			}
+		}
 		// Activation is harmless if already active or all required services
 		// have not yet been found.
 		activate();
@@ -263,7 +275,7 @@ public class Activator implements Bundle
 	public synchronized void removedService(ServiceReference<Object> reference, Object service) {
 		if (service instanceof Coordinator) {
 			if (service.equals(coordinator)) {
-				Coordinator coordinator = (Coordinator)findAlternateServiceFor(this.coordinator);
+				Coordinator coordinator = findAlternateServiceFor(Coordinator.class);
 				if (coordinator == null)
 					deactivate();
 				this.coordinator = coordinator;
@@ -271,7 +283,7 @@ public class Activator implements Bundle
 		}
 		else if (service instanceof RegionDigraph) {
 			if (service.equals(regionDigraph)) {
-				RegionDigraph regionDigraph = (RegionDigraph)findAlternateServiceFor(this.regionDigraph);
+				RegionDigraph regionDigraph = findAlternateServiceFor(RegionDigraph.class);
 				if (regionDigraph == null)
 					deactivate();
 				this.regionDigraph = regionDigraph;
@@ -279,22 +291,33 @@ public class Activator implements Bundle
 		}
 		else if (service instanceof Resolver) {
 			if (service.equals(resolver)) {
-				Resolver resolver = (Resolver)findAlternateServiceFor(this.resolver);
+				Resolver resolver = findAlternateServiceFor(Resolver.class);
 				if (resolver == null)
 					deactivate();
 				this.resolver = resolver;
 			}
 		}
-		else if (service instanceof ModelledResourceManager) {
-			if (service.equals(modelledResourceManager)) {
-				ModelledResourceManager modelledResourceManager = (ModelledResourceManager)findAlternateServiceFor(this.modelledResourceManager);
-				if (modelledResourceManager == null)
-					deactivate();
-				this.modelledResourceManager = modelledResourceManager;
-			}
-		}
 		else if (service instanceof IDirectoryFinder)
 			finders.remove(service);
+        else {
+            if (service.equals(modelledResourceManager)) {
+                try {
+                    Class clazz = getClass().getClassLoader().loadClass(MODELLED_RESOURCE_MANAGER);
+                    Object manager = findAlternateServiceFor(clazz);
+                    if (manager == null) {
+                        modelledResourceManager = null;
+                        serviceModeller = null;
+                    } else {
+                        modelledResourceManager = service;
+                        serviceModeller = new ApplicationServiceModeller(service);
+                    }
+                } catch (ClassNotFoundException e) {
+                    // ignore
+                } catch (NoClassDefFoundError e) {
+                    // ignore
+                }
+            }
+        }
 	}
 	
 	/* End ServiceTrackerCustomizer methods */

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleResource.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleResource.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleResource.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleResource.java Mon Jun 30 16:54:57 2014
@@ -19,17 +19,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResourceManager;
-import org.apache.aries.application.modelling.ModellerException;
-import org.apache.aries.application.modelling.ParsedServiceElements;
 import org.apache.aries.subsystem.core.archive.BundleManifest;
 import org.apache.aries.subsystem.core.archive.BundleRequiredExecutionEnvironmentHeader;
 import org.apache.aries.subsystem.core.archive.BundleSymbolicNameHeader;
@@ -49,7 +43,6 @@ import org.apache.aries.util.filesystem.
 import org.apache.aries.util.io.IOUtils;
 import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.resource.Capability;
-import org.osgi.resource.Namespace;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
 import org.osgi.service.subsystem.SubsystemException;
@@ -66,7 +59,7 @@ public class BundleResource implements R
 	private final BundleManifest manifest;
 	private final List<Requirement> requirements = new ArrayList<Requirement>();
 	
-	public BundleResource(IFile content) throws ModellerException {
+	public BundleResource(IFile content) {
 		this.content = content;
 		IDirectory dir = content.isDirectory() ? content.convert() : content.convertNested();
 		manifest = computeManifest(dir);
@@ -163,41 +156,6 @@ public class BundleResource implements R
 		capabilities.add(new OsgiIdentityCapability(this, manifest));
 	}
 	
-	private void computeOsgiServiceCapabilities(Collection<ExportedService> services) {
-		for (ExportedService service : services)
-			capabilities.add(new BasicCapability.Builder()
-					.namespace(ServiceNamespace.SERVICE_NAMESPACE)
-					.attribute(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE, new ArrayList<String>(service.getInterfaces()))
-					.attributes(service.getServiceProperties())
-					.resource(this)
-					.build());
-	}
-	
-	private void computeOsgiServiceRequirements(Collection<ImportedService> services) {
-		for (ImportedService service : services) {
-			StringBuilder builder = new StringBuilder("(&(")
-					.append(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE)
-					.append('=')
-					.append(service.getInterface())
-					.append(')');
-			String filter = service.getFilter();
-			if (filter != null)
-				builder.append(filter);
-			builder.append(')');
-			requirements.add(new BasicRequirement.Builder()
-					.namespace(ServiceNamespace.SERVICE_NAMESPACE)
-					.directive(Namespace.REQUIREMENT_FILTER_DIRECTIVE, builder.toString())
-					.directive(
-							Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE, 
-							service.isOptional() ? Namespace.RESOLUTION_OPTIONAL : Namespace.RESOLUTION_MANDATORY)
-					.directive(
-							Namespace.REQUIREMENT_CARDINALITY_DIRECTIVE, 
-							service.isMultiple() ? Namespace.CARDINALITY_MULTIPLE : Namespace.CARDINALITY_SINGLE)
-					.resource(this)
-					.build());
-		}
-	}
-	
 	private void computeOsgiWiringBundleCapability() {
 		// TODO The osgi.wiring.bundle capability should not be provided for fragments. Nor should the host capability.
 		BundleSymbolicNameHeader bsnh = (BundleSymbolicNameHeader)manifest.getHeader(BundleSymbolicNameHeader.NAME);
@@ -224,7 +182,7 @@ public class BundleResource implements R
 			requirements.addAll(iph.toRequirements(this));
 	}
 	
-	private void computeRequirementsAndCapabilities(IDirectory directory) throws ModellerException {
+	private void computeRequirementsAndCapabilities(IDirectory directory) {
 		// Compute all requirements and capabilities other than those related
 		// to services.
 		computeRequirementsOtherThanService();
@@ -239,14 +197,15 @@ public class BundleResource implements R
 			return;
 		// Compute service requirements and capabilities if the optional
 		// ModelledResourceManager service is present.
-		ModelledResourceManager manager = getModelledResourceManager();
-		if (manager == null)
+		ServiceModeller modeller = getServiceModeller();
+		if (modeller == null)
 			return;
-		ParsedServiceElements elements = manager.getServiceElements(directory);
-		if (computeServiceRequirements)
-			computeOsgiServiceRequirements(elements.getReferences());
+
+		ServiceModeller.ServiceModel model = modeller.computeRequirementsAndCapabilities(this, directory);
 		if (computeServiceCapabilities)
-			computeOsgiServiceCapabilities(elements.getServices());
+			capabilities.addAll(model.getServiceCapabilities());
+		if (computeServiceRequirements)
+			requirements.addAll(model.getServiceRequirements());
 	}
 	
 	private void computeRequirementsOtherThanService() {
@@ -275,8 +234,8 @@ public class BundleResource implements R
 		return name.substring(index + 1);
 	}
 
-	private ModelledResourceManager getModelledResourceManager() {
-		return Activator.getInstance().getModelledResourceManager();
+	private ServiceModeller getServiceModeller() {
+		return Activator.getInstance().getServiceModeller();
 	}
 
 	private void jar(JarOutputStream out, String prefix, IDirectory directory) throws IOException {

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleRevisionResource.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleRevisionResource.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleRevisionResource.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/BundleRevisionResource.java Mon Jun 30 16:54:57 2014
@@ -14,28 +14,18 @@
 package org.apache.aries.subsystem.core.internal;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.aries.application.modelling.ExportedService;
-import org.apache.aries.application.modelling.ImportedService;
-import org.apache.aries.application.modelling.ModelledResourceManager;
-import org.apache.aries.application.modelling.ModellerException;
-import org.apache.aries.application.modelling.ParsedServiceElements;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.resource.Capability;
-import org.osgi.resource.Namespace;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
-import org.osgi.service.subsystem.SubsystemException;
 
 public class BundleRevisionResource implements Resource {
 	private final BundleRevision revision;
-	
-	private volatile ParsedServiceElements elements;
-	
+
 	public BundleRevisionResource(BundleRevision revision) {
 		if (revision == null)
 			throw new NullPointerException();
@@ -79,78 +69,25 @@ public class BundleRevisionResource impl
 			result = Collections.unmodifiableList(computeServiceRequirements());
 		return result;
 	}
-	
-	private ParsedServiceElements computeParsedServiceElements() {
-		Activator activator = Activator.getInstance();
-		ModelledResourceManager manager = activator.getModelledResourceManager();
-		if (manager == null)
-			return null;
-		BundleDirectory directory = new BundleDirectory(revision.getBundle());
-		try {
-			return manager.getServiceElements(directory);
-		}
-		catch (ModellerException e) {
-			throw new SubsystemException(e);
-		}
-	}
-	
+
 	private List<Capability> computeServiceCapabilities() {
-		ParsedServiceElements elements = getParsedServiceElements();
-		if (elements == null)
-			return Collections.emptyList();
-		Collection<? extends ExportedService> services = elements.getServices();
-		if (services.isEmpty())
-			return Collections.emptyList();
-		List<Capability> result = new ArrayList<Capability>(services.size());
-		for (ExportedService service : services)
-			result.add(new BasicCapability.Builder()
-					.namespace(ServiceNamespace.SERVICE_NAMESPACE)
-					.attribute(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE, new ArrayList<String>(service.getInterfaces()))
-					.attributes(service.getServiceProperties())
-					.resource(this)
-					.build());
-		return result;
+        Activator activator = Activator.getInstance();
+        ServiceModeller modeller = activator.getServiceModeller();
+        if (modeller == null)
+            return Collections.emptyList();
+        ServiceModeller.ServiceModel model =
+                modeller.computeRequirementsAndCapabilities(this, new BundleDirectory(revision.getBundle()));
+        return model.getServiceCapabilities();
 	}
-	
+
 	private List<Requirement> computeServiceRequirements() {
-		ParsedServiceElements elements = getParsedServiceElements();
-		if (elements == null)
-			return Collections.emptyList();
-		Collection<? extends ImportedService> services = elements.getReferences();
-		if (services.isEmpty())
-			return Collections.emptyList();
-		List<Requirement> result = new ArrayList<Requirement>(services.size());
-		for (ImportedService service : services) {
-			StringBuilder builder = new StringBuilder("(&(")
-					.append(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE)
-					.append('=')
-					.append(service.getInterface())
-					.append(')');
-			String filter = service.getFilter();
-			if (filter != null)
-				builder.append('(').append(filter).append(')');
-			builder.append(')');
-			result.add(new BasicRequirement.Builder()
-					.namespace(ServiceNamespace.SERVICE_NAMESPACE)
-					.directive(Namespace.REQUIREMENT_FILTER_DIRECTIVE, builder.toString())
-					.directive(
-							Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE, 
-							service.isOptional() ? Namespace.RESOLUTION_OPTIONAL : Namespace.RESOLUTION_MANDATORY)
-					.resource(this)
-					.build());
-		}
-		return result;
+        Activator activator = Activator.getInstance();
+        ServiceModeller modeller = activator.getServiceModeller();
+        if (modeller == null)
+            return Collections.emptyList();
+        ServiceModeller.ServiceModel model =
+                modeller.computeRequirementsAndCapabilities(this, new BundleDirectory(revision.getBundle()));
+        return model.getServiceRequirements();
 	}
 
-	private ParsedServiceElements getParsedServiceElements() {
-		ParsedServiceElements result = elements;
-		if (result == null) {
-			synchronized (this) {
-				result = elements;
-				if (result == null)
-					elements = result = computeParsedServiceElements();
-			}
-		}
-		return result;
-	}
 }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/InstallAction.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/InstallAction.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/InstallAction.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/InstallAction.java Mon Jun 30 16:54:57 2014
@@ -14,14 +14,18 @@
 package org.apache.aries.subsystem.core.internal;
 
 import java.io.InputStream;
+import java.io.IOException;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import org.apache.aries.util.filesystem.ICloseableDirectory;
 import org.apache.aries.util.filesystem.IDirectory;
 import org.osgi.service.coordinator.Coordination;
 import org.osgi.service.coordinator.CoordinationException;
 import org.osgi.service.subsystem.SubsystemException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InstallAction implements PrivilegedAction<BasicSubsystem> {
 	private final IDirectory content;
@@ -29,6 +33,7 @@ public class InstallAction implements Pr
 	private final InputStream deploymentManifest;
 	private final String location;
 	private final BasicSubsystem parent;
+	private static final Logger logger = LoggerFactory.getLogger(InstallAction.class);
 	
 	public InstallAction(String location, IDirectory content, BasicSubsystem parent, AccessControlContext context, InputStream deploymentManifest) {
 		this.location = location;
@@ -86,10 +91,26 @@ public class InstallAction implements Pr
 					throw (SecurityException)t;
 				throw new SubsystemException(t);
 			}
+			finally {
+				closeContentIfIClosable();
+			}
 		}
 		return result;
 	}
 
+	private void closeContentIfIClosable() {
+		//clean up temp file
+		if (content instanceof ICloseableDirectory) {
+			try{
+				((ICloseableDirectory) content).close();
+			}
+			catch (IOException ioex) {
+				logger.info("Exception calling close for content {}. Exception {}", 
+						content, ioex);					
+			}
+		} 
+	}
+	
 	private void checkLifecyclePermission(final BasicSubsystem subsystem) {
 		AccessController.doPrivileged(new PrivilegedAction<Object>() {
 			@Override

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Location.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Location.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Location.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Location.java Mon Jun 30 16:54:57 2014
@@ -55,9 +55,21 @@ public class Location {
       String scheme = locationUri.getScheme();
       if (LocationType.SUBSYSTEM.scheme.equals(scheme)) {
         type = LocationType.SUBSYSTEM;
-        subsystemUri = new SubsystemUri(location);
-        url = subsystemUri.getURL(); // subsystem uris may contain a nested url.
-        uri = (url==null) ? null : url.toURI(); 
+        SubsystemUri ssUri;
+        try {
+          ssUri = new SubsystemUri(location);
+        } catch (Exception ex) {
+          // In some cases the SubsystemUri can't be parsed by the SubsystemUri parser.
+          ssUri = null;
+        }
+        subsystemUri = ssUri;
+        if (subsystemUri != null) {
+          url = subsystemUri.getURL(); // subsystem uris may contain a nested url.
+          uri = (url==null) ? null : url.toURI();
+        } else {
+          url = null;
+          uri = locationUri;
+        }
       } else if (LocationType.IDIRFINDER.scheme.equals(scheme)) {
         type = LocationType.IDIRFINDER;
         subsystemUri = null;
@@ -82,11 +94,11 @@ public class Location {
   }
     
   public String getSymbolicName() {
-    return (type==LocationType.SUBSYSTEM) ? subsystemUri.getSymbolicName() : null;
+    return (subsystemUri!=null) ? subsystemUri.getSymbolicName() : null;
   }
     
   public Version getVersion() {
-    return (type==LocationType.SUBSYSTEM) ? subsystemUri.getVersion() : null;
+    return (subsystemUri!=null) ? subsystemUri.getVersion() : null;
   }
 
   public IDirectory open() throws IOException, URISyntaxException {
@@ -126,5 +138,10 @@ public class Location {
     }
     throw new IOException("cannot find IDirectory corresponding to id " + uri);
   }
+  
+  @Override
+  public String toString() {
+	  return value;
+  }
 
-}
\ No newline at end of file
+}

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java Mon Jun 30 16:54:57 2014
@@ -31,7 +31,6 @@ import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.aries.application.modelling.ModellerException;
 import org.apache.aries.subsystem.core.archive.DeploymentManifest;
 import org.apache.aries.subsystem.core.archive.Header;
 import org.apache.aries.subsystem.core.archive.ImportPackageHeader;
@@ -62,8 +61,12 @@ import org.osgi.resource.Resource;
 import org.osgi.service.resolver.ResolutionException;
 import org.osgi.service.subsystem.Subsystem.State;
 import org.osgi.service.subsystem.SubsystemConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RawSubsystemResource implements Resource {
+	private static final Logger logger = LoggerFactory.getLogger(RawSubsystemResource.class);
+	
 	private static final Pattern PATTERN = Pattern.compile("([^@/\\\\]+)(?:@(.+))?.esa");
 	private static final String APPLICATION_IMPORT_SERVICE_HEADER = "Application-ImportService";
 	
@@ -112,7 +115,7 @@ public class RawSubsystemResource implem
 	private final SubsystemManifest subsystemManifest;
 	private final Collection<TranslationFile> translations;
 	
-	public RawSubsystemResource(String location, IDirectory content) throws URISyntaxException, IOException, ResolutionException, ModellerException {
+	public RawSubsystemResource(String location, IDirectory content) throws URISyntaxException, IOException, ResolutionException {
 		id = SubsystemIdentifier.getNextId();
 		this.location = new Location(location);
 		if (content == null)
@@ -401,7 +404,7 @@ public class RawSubsystemResource implem
 		return new DependencyCalculator(resources).calculateDependencies();
 	}
 	
-	private Collection<Resource> computeResources(IDirectory directory) throws IOException, URISyntaxException, ResolutionException, ModellerException {
+	private Collection<Resource> computeResources(IDirectory directory) throws IOException, URISyntaxException, ResolutionException {
 		List<IFile> files = directory.listFiles();
 		if (files.isEmpty())
 			return Collections.emptyList();
@@ -419,6 +422,9 @@ public class RawSubsystemResource implem
 					}
 					catch (Exception e) {
 						// Ignore if the resource is an invalid bundle or not a bundle at all.
+						if (logger.isDebugEnabled()) {
+							logger.debug("File \"" + file.getName() + "\" in subsystem with location \"" + location + "\" will be ignored because it is not recognized as a supported resource", e);
+						}
 					}
 				}
 			}
@@ -431,6 +437,9 @@ public class RawSubsystemResource implem
 					}
 					catch (Exception e) {
 						// Ignore
+						if (logger.isDebugEnabled()) {
+							logger.debug("File \"" + file.getName() + "\" in subsystem with location \"" + location + "\" will be ignored because it is not recognized as a supported resource", e);
+						}
 					}
 				}
 			}

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java Mon Jun 30 16:54:57 2014
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.aries.application.modelling.ModellerException;
 import org.apache.aries.subsystem.core.archive.Attribute;
 import org.apache.aries.subsystem.core.archive.DeployedContentHeader;
 import org.apache.aries.subsystem.core.archive.DeploymentManifest;
@@ -84,7 +83,7 @@ public class SubsystemResource implement
 	private final Collection<Resource> sharedContent = new HashSet<Resource>();
 	private final Collection<Resource> sharedDependencies = new HashSet<Resource>();
 	
-	public SubsystemResource(String location, IDirectory content, BasicSubsystem parent) throws URISyntaxException, IOException, ResolutionException, BundleException, InvalidSyntaxException, ModellerException {
+	public SubsystemResource(String location, IDirectory content, BasicSubsystem parent) throws URISyntaxException, IOException, ResolutionException, BundleException, InvalidSyntaxException {
 		this(new RawSubsystemResource(location, content), parent);
 	}
 	
@@ -342,7 +341,7 @@ public class SubsystemResource implement
 			Resource resource = findContent(requirement);
 			if (resource == null) {
 				if (clause.isMandatory())
-					throw new SubsystemException("Resource does not exist: "+ requirement);
+					throw new SubsystemException("A required content resource could not be found. This means the resource was either missing or not recognized as a supported resource format due to, for example, an invalid bundle manifest or blueprint XML file. Turn on debug logging for more information. The resource was: " + requirement);
 				continue;
 			}
 			addContentResource(resource);
@@ -359,7 +358,7 @@ public class SubsystemResource implement
 			for (ProvisionResourceHeader.Clause clause : header.getClauses()) {
 				Resource resource = findDependency(clause);
 				if (resource == null)
-					throw new SubsystemException("Resource does not exist: " + clause);
+					throw new SubsystemException("A required dependency could not be found. This means the resource was either missing or not recognized as a supported resource format due to, for example, an invalid bundle manifest or blueprint XML file. Turn on debug logging for more information. The resource was: " + resource);
 				addDependency(resource);
 			}
 		}	
@@ -370,9 +369,16 @@ public class SubsystemResource implement
 		try {
 			Map<Resource, List<Wire>> resolution = Activator.getInstance().getResolver().resolve(createResolveContext());
 			setImportIsolationPolicy(resolution);
-			for (Resource resource : resolution.keySet()) {
-				if (!contentHeader.contains(resource)) {
-					addDependency(resource);
+			for (Map.Entry<Resource, List<Wire>> entry : resolution.entrySet()) {
+				Resource key = entry.getKey();
+				if (!contentHeader.contains(key)) {
+					addDependency(key);
+				}
+				for (Wire wire : entry.getValue()) {
+					Resource provider = wire.getProvider();
+					if (!contentHeader.contains(provider)) {
+						addDependency(provider);
+					}
 				}
 			}
 		}

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java Mon Jun 30 16:54:57 2014
@@ -106,10 +106,12 @@ public class SubsystemResourceInstaller 
 				ResourceInstaller.newInstance(coordination, dependency, subsystem).install();
 		}
 		// ...followed by content.
-		List<Resource> installableContent = new ArrayList<Resource>(subsystem.getResource().getInstallableContent());
-		Collections.sort(installableContent, comparator);
-		for (Resource content : installableContent)
-			ResourceInstaller.newInstance(coordination, content, subsystem).install();
+		if (State.INSTALLING.equals(subsystem.getState())) {
+			List<Resource> installableContent = new ArrayList<Resource>(subsystem.getResource().getInstallableContent());
+			Collections.sort(installableContent, comparator);
+			for (Resource content : installableContent)
+				ResourceInstaller.newInstance(coordination, content, subsystem).install();
+		}
 		// Simulate installation of shared content so that necessary relationships are established.
 		for (Resource content : subsystem.getResource().getSharedContent())
 			ResourceInstaller.newInstance(coordination, content, subsystem).install();

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemUri.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemUri.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemUri.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemUri.java Mon Jun 30 16:54:57 2014
@@ -80,7 +80,8 @@ public class SubsystemUri {
 	public Version getVersion() {
 		return version;
 	}
-	
+
+    @SuppressWarnings("deprecation")
 	public String toString() {
 		StringBuilder builder = new StringBuilder("subsystem://");
 		if (url != null) {

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java Mon Jun 30 16:54:57 2014
@@ -73,6 +73,7 @@ public class BundleRequiredExecutionEnvi
 	}
 	
 	@Test
+    @SuppressWarnings("deprecation")
 	public void testHeaderWithMultipleClauses() {
 		String value = "CDC-1.0/Foundation-1.0,OSGi/Minimum-1.2,J2SE-1.4,JavaSE-1.6,AA/BB-1.7,V1-1.5/V2-1.6,MyEE-badVersion";
 		String filter = "(|" +

Copied: aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java (from r1605887, aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java)
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java?p2=aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java&p1=aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java&r1=1605887&r2=1606837&rev=1606837&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java Mon Jun 30 16:54:57 2014
@@ -14,14 +14,18 @@
 package org.apache.aries.subsystem.core.internal;
 
 import static org.junit.Assert.assertEquals;
+import static org.easymock.EasyMock.*;
 
 import java.lang.reflect.Field;
+import java.util.Collections;
 
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
 
 public class BundleRevisionResourceTest {
     Activator storedActivator;
@@ -44,7 +48,9 @@ public class BundleRevisionResourceTest 
 
     @Test
     public void testNoModellerServiceCapabilities() {
-        BundleRevision br = EasyMock.createNiceMock(BundleRevision.class);
+        BundleRevision br = createNiceMock(BundleRevision.class);
+        expect(br.getCapabilities(anyObject(String.class))).andReturn(Collections.<Capability>emptyList());
+        replay(br);
         BundleRevisionResource brr = new BundleRevisionResource(br);
         assertEquals(0, brr.getCapabilities("osgi.service").size());
     }
@@ -52,6 +58,8 @@ public class BundleRevisionResourceTest 
     @Test
     public void testNoModellerServiceRequirements() {
         BundleRevision br = EasyMock.createNiceMock(BundleRevision.class);
+        expect(br.getRequirements(anyObject(String.class))).andReturn(Collections.<Requirement>emptyList());
+        replay(br);
         BundleRevisionResource brr = new BundleRevisionResource(br);
         assertEquals(0, brr.getRequirements("osgi.service").size());
     }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java Mon Jun 30 16:54:57 2014
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
 import java.net.MalformedURLException;
 
 import org.junit.Test;
+import org.osgi.framework.Version;
 
 public class LocationTest {
 	@Test
@@ -48,4 +49,25 @@ public class LocationTest {
 			fail("Wrong exception");
 		}
 	}
+
+    @Test
+    public void testSubsystemLocation() throws Exception {
+        String locationString = "subsystem://?Subsystem-SymbolicName=org.osgi.service.subsystem.root&Subsystem-Version=1.2.3";
+
+        Location location = new Location(locationString);
+        assertEquals(locationString, location.getValue());
+        assertEquals("org.osgi.service.subsystem.root", location.getSymbolicName());
+        assertEquals(Version.parseVersion("1.2.3"), location.getVersion());
+    }
+
+    @Test
+    public void testSubsystemLocationInvalid() throws Exception {
+        // In some cases the following location string is generated
+        String locationString = "subsystem://?Subsystem-SymbolicName=org.osgi.service.subsystem.root&Subsystem-Version=1.0.0!/my-subsystem@0.5.0";
+
+        Location location = new Location(locationString);
+        assertEquals(locationString, location.getValue());
+        assertNull(location.getSymbolicName());
+        assertNull(location.getVersion());
+    }
 }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-example/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        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
+<!--
+    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.
-    -->
+    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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -32,11 +32,12 @@
     <version>0.1-SNAPSHOT</version>
     <description>Subsystems example for Aries</description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example</url>
+    </scm>
 
     <modules>
         <module>subsystem-helloIsolation</module>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml Mon Jun 30 16:54:57 2014
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
     </parent>  
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -46,6 +46,7 @@
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.example.helloIsolation
         </aries.osgi.private.pkg>
+        <aries.skip.version.check>true</aries.skip.version.check>
     </properties>
 
     <dependencies>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml Mon Jun 30 16:54:57 2014
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
     </parent>  
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -50,6 +50,7 @@
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.example.helloIsolationRef
         </aries.osgi.private.pkg>
+        <aries.skip.version.check>true</aries.skip.version.check>
     </properties>
 
     <dependencies>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-executor/pom.xml Mon Jun 30 16:54:57 2014
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-install/pom.xml Mon Jun 30 16:54:57 2014
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests-api-bundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,21 +1,31 @@
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -26,11 +36,15 @@
     <description>
         Application interfaces used in subsystem itests
     </description>
-    
+
     <properties>
-		<aries.osgi.export.pkg>
-			org.apache.aries.subsystem.itests.hello.api
-		</aries.osgi.export.pkg>
-		<aries.osgi.private.pkg />
-	</properties>
+        <aries.osgi.export.pkg>
+            org.apache.aries.subsystem.itests.hello.api
+        </aries.osgi.export.pkg>
+        <aries.osgi.private.pkg/>
+        <!-- this bundle has never been released, we should skip -->
+        <aries.skip.version.check>true</aries.skip.version.check>
+        
+    </properties>
+
 </project>



Mime
View raw message