You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:25:21 UTC
[sling-org-apache-sling-datasource] 11/22: SLING-4147 - Remove
extensions from package name
org.apache.sling.extensions.datasource.internal
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.datasource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-datasource.git
commit 814eded7cdad7e124c4979fa0cb2e8a2a263712d
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Mon Nov 10 05:21:50 2014 +0000
SLING-4147 - Remove extensions from package name org.apache.sling.extensions.datasource.internal
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/datasource@1637789 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 4 ++--
.../sling/{extensions => }/datasource/internal/DataSourceFactory.java | 4 ++--
.../sling/{extensions => }/datasource/internal/DriverDataSource.java | 2 +-
.../sling/{extensions => }/datasource/internal/DriverRegistry.java | 2 +-
.../java/org/apache/sling/extensions/datasource/DataSourceIT.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index fa7ed6e..f987e4d 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java b/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java
similarity index 98%
rename from src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java
rename to src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java
index eb56710..436ebf3 100644
--- a/src/main/java/org/apache/sling/extensions/datasource/internal/DataSourceFactory.java
+++ b/src/main/java/org/apache/sling/datasource/internal/DataSourceFactory.java
@@ -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";
diff --git a/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java b/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java
similarity index 99%
rename from src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java
rename to src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java
index 58f7ccb..f8bcdd0 100644
--- a/src/main/java/org/apache/sling/extensions/datasource/internal/DriverDataSource.java
+++ b/src/main/java/org/apache/sling/datasource/internal/DriverDataSource.java
@@ -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;
diff --git a/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java b/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java
similarity index 99%
rename from src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java
rename to src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java
index 732433e..ceebf72 100644
--- a/src/main/java/org/apache/sling/extensions/datasource/internal/DriverRegistry.java
+++ b/src/main/java/org/apache/sling/datasource/internal/DriverRegistry.java
@@ -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;
diff --git a/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java b/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java
index a830a5c..73fd3f2 100644
--- a/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java
+++ b/src/test/java/org/apache/sling/extensions/datasource/DataSourceIT.java
@@ -47,7 +47,7 @@ public class DataSourceIT extends DataSourceTestBase{
}
- String PID = "org.apache.sling.extensions.datasource.DataSourceFactory";
+ String PID = "org.apache.sling.datasource.DataSourceFactory";
@Inject
ConfigurationAdmin ca;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.