You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/10/12 23:33:10 UTC
svn commit: r1708256 - in /sling/whiteboard/olli/settings/launchpad: ./ src/main/java/org/apache/sling/settings/impl/ src/main/java/org/apache/sling/settings/launchpad/internal/ src/main/resources/OSGI-INF/metatype/ src/test/java/org/apache/sling/setti...

Author: olli
Date: Mon Oct 12 21:33:09 2015
New Revision: 1708256

URL: http://svn.apache.org/viewvc?rev=1708256&view=rev
Log:
move classes from package impl to package launchpad/internal

Added:
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/Activator.java
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/Activator.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/ServicesListener.java
      - copied, changed from r1708247, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/ServicesListener.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SettingsServiceConfigurator.java
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SettingsServiceConfigurator.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
    sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml
    sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/RunModeImplTest.java
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
    sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java
      - copied, changed from r1708243, sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
Removed:
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/Activator.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/ServicesListener.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SettingsServiceConfigurator.java
    sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
    sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml
    sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
    sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
Modified:
    sling/whiteboard/olli/settings/launchpad/pom.xml

Modified: sling/whiteboard/olli/settings/launchpad/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/pom.xml?rev=1708256&r1=1708255&r2=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/pom.xml (original)
+++ sling/whiteboard/olli/settings/launchpad/pom.xml Mon Oct 12 21:33:09 2015
@@ -65,11 +65,8 @@
                         <Bundle-DocURL>
                             http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
                         </Bundle-DocURL>
-                        <Private-Package>
-                            org.apache.sling.settings.impl
-                        </Private-Package>
                         <Bundle-Activator>
-                            org.apache.sling.settings.impl.Activator
+                            org.apache.sling.settings.launchpad.internal.Activator
                         </Bundle-Activator>
                         <DynamicImport-Package>
                             org.osgi.service.cm,

Copied: sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/Activator.java (from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/Activator.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/Activator.java?p2=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/Activator.java&p1=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/Activator.java&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/Activator.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/Activator.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Copied: sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/ServicesListener.java (from r1708247, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/ServicesListener.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/ServicesListener.java?p2=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/ServicesListener.java&p1=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/ServicesListener.java&r1=1708247&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/ServicesListener.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/ServicesListener.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import java.util.Dictionary;
 import java.util.Hashtable;

Copied: sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SettingsServiceConfigurator.java (from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SettingsServiceConfigurator.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SettingsServiceConfigurator.java?p2=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SettingsServiceConfigurator.java&p1=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SettingsServiceConfigurator.java&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SettingsServiceConfigurator.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SettingsServiceConfigurator.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import java.util.Dictionary;
 import java.util.Hashtable;

Copied: sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java (from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java?p2=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java&p1=sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Copied: sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml (from r1708243, sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml?p2=sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml&p1=sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.impl.SlingSettingsServiceImpl.xml (original)
+++ sling/whiteboard/olli/settings/launchpad/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml Mon Oct 12 21:33:09 2015
@@ -18,11 +18,11 @@
     under the License.
 --><metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" 
                       localization="OSGI-INF/metatype/metatype">
-    <OCD id="org.apache.sling.settings.impl.SlingSettingsServiceImpl" name="%settings.name" description="%settings.description">
+    <OCD id="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl" name="%settings.name" description="%settings.description">
         <AD id="sling.name" type="String" name="%sling.name.name" description="%sling.name.description"/>
         <AD id="sling.description" type="String" name="%sling.description.name" description="%sling.description.description"/>
     </OCD>
-    <Designate pid="org.apache.sling.settings.impl.SlingSettingsServiceImpl">
-        <Object ocdref="org.apache.sling.settings.impl.SlingSettingsServiceImpl"/>
+    <Designate pid="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl">
+        <Object ocdref="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl"/>
     </Designate>
 </metatype:MetaData>
\ No newline at end of file

Copied: sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/RunModeImplTest.java (from r1708243, sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/RunModeImplTest.java?p2=sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/RunModeImplTest.java&p1=sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/RunModeImplTest.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertFalse;

Copied: sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java (from r1708243, sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java?p2=sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java&p1=sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java&r1=1708243&r2=1708256&rev=1708256&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java (original)
+++ sling/whiteboard/olli/settings/launchpad/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java Mon Oct 12 21:33:09 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.settings.impl;
+package org.apache.sling.settings.launchpad.internal;
 
 import java.io.File;
 import java.io.FileOutputStream;