You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ch...@apache.org on 2014/11/10 06:21:51 UTC
svn commit: r1637789 - in /sling/trunk/contrib/extensions/datasource: ./ src/main/java/org/apache/sling/datasource/ src/main/java/org/apache/sling/datasource/internal/ src/main/java/org/apache/sling/extensions/datasource/internal/ src/test/java/org/apa...

Author: chetanm
Date: Mon Nov 10 05:21:50 2014
New Revision: 1637789

URL: http://svn.apache.org/r1637789
Log:
SLING-4147 - Remove extensions from package name org.apache.sling.extensions.datasource.internal

Added:
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java   (contents, props changed)
      - copied, changed from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java   (contents, props changed)
      - copied, changed from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java   (contents, props changed)
      - copied, changed from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java
Removed:
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java
    sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java
Modified:
    sling/trunk/contrib/extensions/datasource/README.md
    sling/trunk/contrib/extensions/datasource/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java

Modified: sling/trunk/contrib/extensions/datasource/README.md
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/datasource/README.md?rev=1637789&r1=1637788&r2=1637789&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/datasource/README.md (original)
+++ sling/trunk/contrib/extensions/datasource/README.md Mon Nov 10 05:21:50 2014
@@ -33,10 +33,10 @@ Configuration
 
 1. Install the current bundle
 2. Install the JDBC Driver bundle
-3. Configure the DataSource from OSGi config for PID `org.apache.sling.extensions.datasource.DataSourceFactory`
+3. Configure the DataSource from OSGi config for PID `org.apache.sling.datasource.DataSourceFactory`
 
 If Felix WebConsole is used then you can configure it via Configuration UI at
-http://localhost:8080/system/console/configMgr/org.apache.sling.extensions.datasource.DataSourceFactory
+http://localhost:8080/system/console/configMgr/org.apache.sling.datasource.DataSourceFactory
 
 ![Web Console Config](http://sling.apache.org/documentation/development/sling-datasource-config.png)
 

Copied: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java (from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java?p2=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java&p1=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java&r1=1621703&r2=1637789&rev=1637789&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java (original)
+++ sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java Mon Nov 10 05:21:50 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.extensions.datasource.internal;
+package org.apache.sling.datasource.internal;
 
 import java.lang.management.ManagementFactory;
 import java.sql.SQLException;
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
         policy = ConfigurationPolicy.REQUIRE
 )
 public class DataSourceFactory {
-    public static final String NAME = "org.apache.sling.extensions.datasource.DataSourceFactory";
+    public static final String NAME = "org.apache.sling.datasource.DataSourceFactory";
 
     @Property
     static final String PROP_DATASOURCE_NAME = "datasource.name";

Propchange: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java (from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java?p2=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java&p1=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java&r1=1621703&r2=1637789&rev=1637789&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java (original)
+++ sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java Mon Nov 10 05:21:50 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.extensions.datasource.internal;
+package org.apache.sling.datasource.internal;
 
 
 import java.io.PrintWriter;

Propchange: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java (from r1621703, sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java?p2=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java&p1=sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java&r1=1621703&r2=1637789&rev=1637789&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java (original)
+++ sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java Mon Nov 10 05:21:50 2014
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.extensions.datasource.internal;
+package org.apache.sling.datasource.internal;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Propchange: sling/trunk/contrib/extensions/datasource/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: sling/trunk/contrib/extensions/datasource/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/datasource/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java?rev=1637789&r1=1637788&r2=1637789&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/datasource/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java (original)
+++ sling/trunk/contrib/extensions/datasource/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java Mon Nov 10 05:21:50 2014
@@ -47,7 +47,7 @@ public class DataSourceIT extends DataSo
     }
 
 
-    String PID = "org.apache.sling.extensions.datasource.DataSourceFactory";
+    String PID = "org.apache.sling.datasource.DataSourceFactory";
 
     @Inject
     ConfigurationAdmin ca;