incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r1390919 - in /sling/trunk: ./ installer/ installer/api/ installer/api/src/ installer/api/src/main/ installer/api/src/main/java/ installer/api/src/main/java/org/ installer/api/src/main/java/org/apache/ installer/api/src/main/java/org/apache...
Date Thu, 27 Sep 2012 10:07:28 GMT
Author: ieb
Date: Thu Sep 27 10:07:25 2012
New Revision: 1390919

URL: http://svn.apache.org/viewvc?rev=1390919&view=rev
Log:
Merge branch 'SLING-2527'

* SLING-2527:
  Adjusted API Bundle version number to 1.0-SNAPSHOT after feedback.
  SLING-2527 Splits API from core in installer set of bundles.

Added:
    sling/trunk/installer/api/
    sling/trunk/installer/api/pom.xml
      - copied, changed from r1390902, sling/trunk/installer/core/pom.xml
    sling/trunk/installer/api/src/
    sling/trunk/installer/api/src/main/
    sling/trunk/installer/api/src/main/java/
    sling/trunk/installer/api/src/main/java/org/
    sling/trunk/installer/api/src/main/java/org/apache/
    sling/trunk/installer/api/src/main/java/org/apache/sling/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateResult.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/Resource.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
    sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
    sling/trunk/installer/api/src/test/
    sling/trunk/installer/api/src/test/java/
    sling/trunk/installer/api/src/test/java/org/
    sling/trunk/installer/api/src/test/java/org/apache/
    sling/trunk/installer/api/src/test/java/org/apache/sling/
    sling/trunk/installer/api/src/test/java/org/apache/sling/installer/
    sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/
    sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java   (contents, props changed)
      - copied, changed from r1390902, sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
    sling/trunk/installer/pom.xml   (with props)
Removed:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateResult.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/Resource.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
    sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
Modified:
    sling/trunk/installer/console/pom.xml
    sling/trunk/installer/core/pom.xml
    sling/trunk/installer/factories/configuration/pom.xml
    sling/trunk/installer/factories/deploymentpck/pom.xml
    sling/trunk/installer/it/pom.xml
    sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
    sling/trunk/installer/providers/file/pom.xml
    sling/trunk/installer/providers/jcr/pom.xml
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    sling/trunk/launchpad/installer/pom.xml
    sling/trunk/pom.xml

Copied: sling/trunk/installer/api/pom.xml (from r1390902, sling/trunk/installer/core/pom.xml)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/pom.xml?p2=sling/trunk/installer/api/pom.xml&p1=sling/trunk/installer/core/pom.xml&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
--- sling/trunk/installer/core/pom.xml (original)
+++ sling/trunk/installer/api/pom.xml Thu Sep 27 10:07:25 2012
@@ -27,20 +27,20 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>org.apache.sling.installer.core</artifactId>
-    <version>3.3.9-SNAPSHOT</version>
+    <artifactId>org.apache.sling.installer.api</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <name>Apache Sling Installer</name>
+    <name>Apache Sling Installer API</name>
     <description> 
-        Provides services to install OSGi bundles and configurations
+        Provides the installer API to install OSGi bundles and configurations
         by supplying input streams and dictionaries.
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/core</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/core</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/installer/core</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/api</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/installer/api</url>
     </scm>
 
 	<build>
@@ -51,23 +51,12 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Bundle-Activator>
-							org.apache.sling.installer.core.impl.Activator
-                        </Bundle-Activator>
 						<Export-Package>
 							org.apache.sling.installer.api;version=3.1.0,
                             org.apache.sling.installer.api.info;version=1.0.0,
                             org.apache.sling.installer.api.event;version=1.0.0,
                             org.apache.sling.installer.api.tasks;version=1.3.0
                         </Export-Package>
-						<Private-Package>
-						    org.apache.sling.installer.core.impl.*
-						</Private-Package>
-                        <Embed-Dependency>
-                            org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*",
-                            org.osgi.compendium;inline="org/osgi/util/tracker/*",
-                            org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/ManifestHeader*.*|org/apache/sling/commons/osgi/PropertiesUtil.*"
-                        </Embed-Dependency>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -124,26 +113,9 @@
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.osgi</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-      <!-- We use a class from the config admin implementation to read config files -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.2.8</version>
-            <scope>provided</scope>
-        </dependency>
       <!-- Basic dependencies for Unit Tests -->
         <dependency>
             <groupId>junit</groupId>
@@ -153,11 +125,5 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jmock</groupId>
-            <artifactId>jmock</artifactId>
-            <version>2.5.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/InstallableResource.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/ResourceChangeListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateHandler.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateHandler.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateResult.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/UpdateResult.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/UpdateResult.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationEvent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/event/InstallationListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InfoProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InstallationState.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/InstallationState.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/InstallationState.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/Resource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/Resource.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/Resource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/info/ResourceGroup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ChangeStateTask.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceState.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/RetryHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java (from r1390902, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java?p2=sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java (from r1390902, sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java?p2=sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java&r1=1390902&r2=1390919&rev=1390919&view=diff
==============================================================================
    (empty)

Propchange: sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/installer/api/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: sling/trunk/installer/console/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/console/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/console/pom.xml (original)
+++ sling/trunk/installer/console/pom.xml Thu Sep 27 10:07:25 2012
@@ -70,8 +70,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.3.8</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/installer/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/core/pom.xml (original)
+++ sling/trunk/installer/core/pom.xml Thu Sep 27 10:07:25 2012
@@ -54,12 +54,6 @@
 						<Bundle-Activator>
 							org.apache.sling.installer.core.impl.Activator
                         </Bundle-Activator>
-						<Export-Package>
-							org.apache.sling.installer.api;version=3.1.0,
-                            org.apache.sling.installer.api.info;version=1.0.0,
-                            org.apache.sling.installer.api.event;version=1.0.0,
-                            org.apache.sling.installer.api.tasks;version=1.3.0
-                        </Export-Package>
 						<Private-Package>
 						    org.apache.sling.installer.core.impl.*
 						</Private-Package>
@@ -144,6 +138,12 @@
             <version>1.2.8</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
       <!-- Basic dependencies for Unit Tests -->
         <dependency>
             <groupId>junit</groupId>

Modified: sling/trunk/installer/factories/configuration/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/pom.xml (original)
+++ sling/trunk/installer/factories/configuration/pom.xml Thu Sep 27 10:07:25 2012
@@ -78,8 +78,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.3.0</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: sling/trunk/installer/factories/deploymentpck/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/deploymentpck/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/factories/deploymentpck/pom.xml (original)
+++ sling/trunk/installer/factories/deploymentpck/pom.xml Thu Sep 27 10:07:25 2012
@@ -75,8 +75,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.3.0</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: sling/trunk/installer/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/it/pom.xml (original)
+++ sling/trunk/installer/it/pom.xml Thu Sep 27 10:07:25 2012
@@ -452,6 +452,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.installer.core</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Thu Sep 27 10:07:25 2012
@@ -385,6 +385,7 @@ class OsgiInstallerTestBase implements F
         	            mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
                         mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.2"),
         	            mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "2.1.2"),
+        	        	mavenBundle("org.apache.sling", "org.apache.sling.installer.api", "3.3.9-SNAPSHOT"), // TODO: Switch to released version when released.
         	        	mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION),
                         mavenBundle("org.apache.sling", "org.apache.sling.installer.factory.configuration", CONFIG_VERSION)
         		)

Added: sling/trunk/installer/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/pom.xml?rev=1390919&view=auto
==============================================================================
--- sling/trunk/installer/pom.xml (added)
+++ sling/trunk/installer/pom.xml Thu Sep 27 10:07:25 2012
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>13</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.sling</groupId>
+    <artifactId>sling-installer-builder</artifactId>
+    <packaging>pom</packaging>
+    <version>1-SNAPSHOT</version>
+
+    <name>Apache Sling Installer (Builder)</name>
+    <description>
+        Pseudo project to build the installers
+    </description>
+
+    <scm>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/installer</url>
+    </scm>
+
+
+    <!-- List modules to be included in the build here ! -->
+    <modules>
+        
+        <!-- Installer -->
+        <module>api</module>
+        <module>core</module>
+        <module>console</module>
+        <module>providers/file</module>
+        <module>providers/jcr</module>
+        <module>factories/configuration</module>
+        <module>factories/deploymentpck</module>
+        <module>it</module>
+        
+    </modules>
+
+</project>

Propchange: sling/trunk/installer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/installer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: sling/trunk/installer/providers/file/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/file/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/providers/file/pom.xml (original)
+++ sling/trunk/installer/providers/file/pom.xml Thu Sep 27 10:07:25 2012
@@ -81,8 +81,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.2.2</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
       <!-- We use a class from the config admin implementation to read config files -->

Modified: sling/trunk/installer/providers/jcr/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/installer/providers/jcr/pom.xml (original)
+++ sling/trunk/installer/providers/jcr/pom.xml Thu Sep 27 10:07:25 2012
@@ -86,8 +86,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.2.2</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Sep 27 10:07:25 2012
@@ -212,6 +212,11 @@
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.installer.core</artifactId>
             <version>3.3.9-SNAPSHOT</version>
         </bundle>

Modified: sling/trunk/launchpad/installer/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/installer/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/launchpad/installer/pom.xml (original)
+++ sling/trunk/launchpad/installer/pom.xml Thu Sep 27 10:07:25 2012
@@ -58,10 +58,11 @@
             <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+        <!-- this may not be strictly necessary but it will ensure the next release binds to the API. Could downgrade to core:3.3.0 if requried --> 
+        <dependency> 
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.installer.core</artifactId>
-            <version>3.3.0</version>
+            <artifactId>org.apache.sling.installer.api</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1390919&r1=1390918&r2=1390919&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Thu Sep 27 10:07:25 2012
@@ -179,6 +179,7 @@
         <module>testing/junit/remote</module>
         
         <!-- Installer -->
+        <module>installer/api</module>
         <module>installer/core</module>
         <module>installer/console</module>
         <module>installer/providers/file</module>



Mime
View raw message