You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/05/02 18:53:22 UTC
svn commit: r652814 - in /incubator/sling/trunk: commons/osgi/NOTICE
commons/osgi/pom.xml commons/osgi/src/test/ jcr/ocm/pom.xml
launchpad/app/pom.xml pom.xml scripting/resolver/pom.xml
sling/adapter/pom.xml sling/servlet-resolver/pom.xml
Author: cziegeler
Date: Fri May 2 09:53:21 2008
New Revision: 652814
URL: http://svn.apache.org/viewvc?rev=652814&view=rev
Log:
SLING-402: Move osgi/commons to commons/osgi - correct poms.
Removed:
incubator/sling/trunk/commons/osgi/src/test/
Modified:
incubator/sling/trunk/commons/osgi/NOTICE
incubator/sling/trunk/commons/osgi/pom.xml
incubator/sling/trunk/jcr/ocm/pom.xml
incubator/sling/trunk/launchpad/app/pom.xml
incubator/sling/trunk/pom.xml
incubator/sling/trunk/scripting/resolver/pom.xml
incubator/sling/trunk/sling/adapter/pom.xml
incubator/sling/trunk/sling/servlet-resolver/pom.xml
Modified: incubator/sling/trunk/commons/osgi/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/NOTICE?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/NOTICE (original)
+++ incubator/sling/trunk/commons/osgi/NOTICE Fri May 2 09:53:21 2008
@@ -1,4 +1,4 @@
-Apache Sling OSGi Commons
+Apache Sling Commons OSGi
Copyright 2007-2008 The Apache Software Foundation
Based on source code originally developed by
Modified: incubator/sling/trunk/commons/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/pom.xml (original)
+++ incubator/sling/trunk/commons/osgi/pom.xml Fri May 2 09:53:21 2008
@@ -27,7 +27,7 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -36,13 +36,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/osgi/commons
+ scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/commons/osgi
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/osgi/commons
+ scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/commons/osgi
</developerConnection>
<url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/commons
+ http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi
</url>
</scm>
@@ -59,7 +59,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.osgi.commons;version=${pom.version}
+ org.apache.sling.commons.osgi;version=${pom.version}
</Export-Package>
</instructions>
</configuration>
@@ -83,11 +83,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Fri May 2 09:53:21 2008
@@ -151,7 +151,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Fri May 2 09:53:21 2008
@@ -323,7 +323,7 @@
-->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Fri May 2 09:53:21 2008
@@ -72,6 +72,7 @@
<!-- The commons sub project -->
<module>commons/json</module>
<module>commons/mime</module>
+ <module>commons/osgi</module>
<module>commons/testing</module>
<!-- The JCR sub project -->
@@ -89,7 +90,6 @@
<module>jcr/webdav</module>
<!-- OSGi -->
- <module>osgi/commons</module>
<module>osgi/console-web</module>
<module>osgi/log</module>
<module>osgi/obr</module>
Modified: incubator/sling/trunk/scripting/resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/resolver/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/resolver/pom.xml (original)
+++ incubator/sling/trunk/scripting/resolver/pom.xml Fri May 2 09:53:21 2008
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/sling/adapter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/pom.xml (original)
+++ incubator/sling/trunk/sling/adapter/pom.xml Fri May 2 09:53:21 2008
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/sling/servlet-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/pom.xml?rev=652814&r1=652813&r2=652814&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/pom.xml (original)
+++ incubator/sling/trunk/sling/servlet-resolver/pom.xml Fri May 2 09:53:21 2008
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.commons</artifactId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>