Author: bdelacretaz
Date: Mon Sep 8 01:28:12 2008
New Revision: 693024
URL: http://svn.apache.org/viewvc?rev=693024&view=rev
Log:
SLING-646 - jcrbundles packages renamed
Added:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/
(props changed)
- copied from r693022,
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrbundles/
incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/
(props changed)
- copied from r693022,
incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrbundles/
Removed:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrbundles/
incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrbundles/
Modified:
incubator/sling/trunk/extensions/jcrinstall/pom.xml
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/AbstractNodeProcessor.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundleNodeProcessor.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolder.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolderCreationListener.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/ConfigNodeProcessor.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesConstants.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesManager.java
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/NodeProcessor.java
Modified: incubator/sling/trunk/extensions/jcrinstall/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/pom.xml?rev=693024&r1=693023&r2=693024&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/pom.xml Mon Sep 8 01:28:12 2008
@@ -27,20 +27,20 @@
<relativePath> ../../sling/parent/</relativePath>
</parent>
- <artifactId>org.apache.sling.jcr.jcrbundles</artifactId>
+ <artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
<version>2.0.3-incubator-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Sling - JCR Bundles Manager</name>
+ <name>Sling - JCR OSGi Installer</name>
<description>
- Loads OSGi bundles and their configurations from well-known
- locations in the JCR Repository. See SLING-587 for details.
+ Loads OSGi bundles, deployment packages and configs from
+ configurable locations in the JCR repository.
</description>
<scm>
- <connection>
scm:svn:http://svn.apache.org/repos/asf/incubator/sling/whiteboard/jcrbundles
</connection>
- <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/incubator/sling/whiteboard/jcrbundles
</developerConnection>
- <url> http://svn.apache.org/viewvc/incubator/sling/whiteboard/jcrbundles
</url>
+ <connection>
scm:svn:http://svn.apache.org/repos/asf/incubator/sling/whiteboard/jcrinstall</connection>
+ <developerConnection>
scm:svn:https://svn.apache.org/repos/asf/incubator/sling/whiteboard/jcrinstall</developerConnection>
+ <url>
http://svn.apache.org/viewvc/incubator/sling/whiteboard/jcrinstall</url>
</scm>
<build>
@@ -55,7 +55,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Private-Package> org.apache.sling.jcr.jcrbundles
</Private-Package>
+ <Private-Package> org.apache.sling.jcr.jcrinstall
</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -100,4 +100,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Propchange:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/AbstractNodeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/AbstractNodeProcessor.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/AbstractNodeProcessor.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/AbstractNodeProcessor.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
import java.io.InputStream;
import java.util.Calendar;
@@ -27,7 +27,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.STATUS_BASE_PATH;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.STATUS_BASE_PATH;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundleNodeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundleNodeProcessor.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundleNodeProcessor.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundleNodeProcessor.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
import java.io.IOException;
import java.io.InputStream;
@@ -26,7 +26,7 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.JCRBUNDLES_LOCATION_PREFIX;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.JCRBUNDLES_LOCATION_PREFIX;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolder.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolder.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolder.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolder.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
import java.util.HashSet;
import java.util.List;
@@ -32,8 +32,8 @@
import javax.jcr.observation.EventListener;
import org.apache.sling.jcr.api.SlingRepository;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.BUNDLES_NODENAME;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.STATUS_BASE_PATH;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.BUNDLES_NODENAME;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.STATUS_BASE_PATH;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolderCreationListener.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolderCreationListener.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolderCreationListener.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/BundlesFolderCreationListener.java
Mon Sep 8 01:28:12 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.BUNDLES_NODENAME;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.BUNDLES_NODENAME;
import java.util.HashSet;
import java.util.Set;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/ConfigNodeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/ConfigNodeProcessor.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/ConfigNodeProcessor.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/ConfigNodeProcessor.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
import java.io.IOException;
import java.io.InputStream;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesConstants.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesConstants.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesConstants.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesConstants.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
/** Constants for this module */
public class JcrBundlesConstants {
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesManager.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesManager.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesManager.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/JcrBundlesManager.java
Mon Sep 8 01:28:12 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.BUNDLES_NODENAME;
-import static
org.apache.sling.jcr.jcrbundles.JcrBundlesConstants.STATUS_BASE_PATH;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.BUNDLES_NODENAME;
+import static
org.apache.sling.jcr.jcrinstall.JcrBundlesConstants.STATUS_BASE_PATH;
import java.util.HashMap;
import java.util.HashSet;
Modified:
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/NodeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/NodeProcessor.java?rev=693024&r1=693022&r2=693024&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/NodeProcessor.java
(original)
+++
incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/NodeProcessor.java
Mon Sep 8 01:28:12 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.jcrbundles;
+package org.apache.sling.jcr.jcrinstall;
import java.util.Map;
Propchange:
incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/
------------------------------------------------------------------------------
svn:mergeinfo =
