date:20091117

svn commit: r881330 - /sling/trunk/contrib/extensions/runmode/pom.xml

2009-11-17 Thread cziegeler

Author: cziegeler
Date: Tue Nov 17 15:17:33 2009
New Revision: 881330

URL: http://svn.apache.org/viewvc?rev=881330view=rev
Log:
Correct svn info and use new parent pom

Modified:
sling/trunk/contrib/extensions/runmode/pom.xml

Modified: sling/trunk/contrib/extensions/runmode/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/runmode/pom.xml?rev=881330r1=881329r2=881330view=diff
==
--- sling/trunk/contrib/extensions/runmode/pom.xml (original)
+++ sling/trunk/contrib/extensions/runmode/pom.xml Tue Nov 17 15:17:33 2009
@@ -23,8 +23,7 @@
 parent
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
-version6/version
-relativePath../../../parent//relativePath
+version7/version
 /parent
 
 artifactIdorg.apache.sling.runmode/artifactId
@@ -39,13 +38,13 @@
 
 scm
 connection
-scm:svn:http://svn.apache.org/repos/asf/sling/whiteboard/runmode
+
scm:svn:http://svn.apache.org/repos/asf/sling/contrib/extensions/runmode
 /connection
 developerConnection
-scm:svn:https://svn.apache.org/repos/asf/sling/whiteboard/runmode
+
scm:svn:https://svn.apache.org/repos/asf/sling/contrib/extensions/runmode
 /developerConnection
 url
-http://svn.apache.org/viewvc/sling/whiteboard/runmode
+http://svn.apache.org/viewvc/sling/contrib/extensions/runmode
 /url
 /scm
 
@@ -82,11 +81,11 @@
 
 dependencies
 dependency
-groupIdorg.apache.felix/groupId
+groupIdorg.osgi/groupId
 artifactIdorg.osgi.core/artifactId
 /dependency
 dependency
-groupIdorg.apache.felix/groupId
+groupIdorg.osgi/groupId
 artifactIdorg.osgi.compendium/artifactId
 /dependency
 dependency

svn commit: r881337 - in /sling/trunk/contrib/extensions/i18n: pom.xml src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java

2009-11-17 Thread cziegeler

Author: cziegeler
Date: Tue Nov 17 15:29:32 2009
New Revision: 881337

URL: http://svn.apache.org/viewvc?rev=881337view=rev
Log:
No need to use the slingtest module, nodetypes are not needed and resource 
resolver can easily be mocked.

Modified:
sling/trunk/contrib/extensions/i18n/pom.xml

sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java

Modified: sling/trunk/contrib/extensions/i18n/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=881337r1=881336r2=881337view=diff
==
--- sling/trunk/contrib/extensions/i18n/pom.xml (original)
+++ sling/trunk/contrib/extensions/i18n/pom.xml Tue Nov 17 15:29:32 2009
@@ -24,7 +24,6 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version7/version
-relativePath../../../parent/pom.xml/relativePath
 /parent
 
 artifactIdorg.apache.sling.i18n/artifactId
@@ -83,7 +82,7 @@
 dependency
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.jcr.api/artifactId
-version2.0.2-incubator/version
+version2.0.4/version
 scopeprovided/scope
 /dependency
 dependency
@@ -122,12 +121,6 @@
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
-artifactIdorg.apache.sling.commons.slingtest/artifactId
-version0.9.1-SNAPSHOT/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.commons.testing/artifactId
 version2.0.5-SNAPSHOT/version
 scopetest/scope

Modified: 
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java?rev=881337r1=881336r2=881337view=diff
==
--- 
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/i18n/src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java
 Tue Nov 17 15:29:32 2009
@@ -19,6 +19,8 @@
 package org.apache.sling.i18n.impl;
 
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -26,11 +28,18 @@
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.RowIterator;
+import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
 
+import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.commons.testing.SlingTestHelper;
 import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
 import org.apache.sling.commons.testing.jcr.RepositoryUtil;
+import org.apache.sling.jcr.resource.JcrResourceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,28 +47,123 @@
  * Tests the {...@link JcrResourceBundle} class.
  */
 public class JcrResourceBundleTest extends RepositoryTestBase {
-
+
 private static final Logger log = 
LoggerFactory.getLogger(JcrResourceBundleTest.class);
 
 protected ResourceResolver resolver;
-
+
 public void setUp() throws Exception {
 super.setUp();
-
+
 cleanRepository();
-
-SlingTestHelper.registerSlingNodeTypes(getSession());
+
 RepositoryUtil.registerNodeType(getSession(), getClass()
 .getResourceAsStream(/SLING-INF/nodetypes/jcrlanguage.cnd));
 RepositoryUtil.registerNodeType(getSession(), getClass()
 .getResourceAsStream(/SLING-INF/nodetypes/message.cnd));
 
-resolver = SlingTestHelper.getResourceResolver(getRepository(),
-getSession());
-
+resolver = new ResourceResolver() {
+
+public IteratorResource findResources(String query,
+String language) {
+// TODO Auto-generated method stub
+return null;
+}
+
+public Resource getResource(Resource base, String path) {
+// TODO Auto-generated method stub
+return null;
+}
+
+public Resource getResource(String path) {
+// TODO Auto-generated method stub
+return null;
+}
+
+public String[] getSearchPath() {
+return new String[] {/apps/, /libs/};
+}
+
+public IteratorResource

svn commit: r881345 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling: AdapterManagerTestHelper.java MockAdapterFactory.java

2009-11-17 Thread cziegeler

Author: cziegeler
Date: Tue Nov 17 16:06:47 2009
New Revision: 881345

URL: http://svn.apache.org/viewvc?rev=881345view=rev
Log:
SLING-1166 : Move sling stuff in sling package (don't use internal as package 
name for public stuff)

Added:

sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java
   (contents, props changed)
  - copied, changed from r881343, 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/AdapterManagerTestHelper.java

sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java
   (contents, props changed)
  - copied, changed from r881225, 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/MockAdapterFactory.java

Copied: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java
 (from r881343, 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/AdapterManagerTestHelper.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java?p2=sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.javap1=sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/AdapterManagerTestHelper.javar1=881343r2=881345rev=881345view=diff
==
--- 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/AdapterManagerTestHelper.java
 (original)
+++ 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java
 Tue Nov 17 16:06:47 2009
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.adapter.internal;
+package org.apache.sling.commons.testing.sling;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.sling.adapter.internal.AdapterManagerImpl;
 import org.apache.sling.api.adapter.AdapterFactory;
 import org.apache.sling.commons.testing.osgi.MockBundle;
 import org.apache.sling.commons.testing.osgi.MockComponentContext;

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java
--
svn:eol-style = native

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/AdapterManagerTestHelper.java
--
svn:keywords = Author Date Id Revision Rev URL

Copied: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java
 (from r881225, 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/MockAdapterFactory.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java?p2=sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.javap1=sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/MockAdapterFactory.javar1=881225r2=881345rev=881345view=diff
==
--- 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/internal/MockAdapterFactory.java
 (original)
+++ 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java
 Tue Nov 17 16:06:47 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.adapter.internal;
+package org.apache.sling.commons.testing.sling;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java
--
svn:eol-style = native

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockAdapterFactory.java
--
svn:keywords = Author Date Id Revision Rev URL

svn commit: r881351 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling: adapter/ commons/testing/sling/SlingTestHelper.java

2009-11-17 Thread cziegeler

Author: cziegeler
Date: Tue Nov 17 16:16:53 2009
New Revision: 881351

URL: http://svn.apache.org/viewvc?rev=881351view=rev
Log:
SLING-1166 : Move sling stuff in sling package (don't use internal as package 
name for public stuff)

Added:

sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.java
   (contents, props changed)
  - copied, changed from r881350, 
sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.java
Removed:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/adapter/

Copied: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.java
 (from r881350, 
sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.java?p2=sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.javap1=sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.javar1=881350r2=881351rev=881351view=diff
==
(empty)

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.java
--
svn:eol-style = native

Propchange: 
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/SlingTestHelper.java
--
svn:keywords = Author Date Id Revision Rev URL

svn commit: r881330 - /sling/trunk/contrib/extensions/runmode/pom.xml

svn commit: r881337 - in /sling/trunk/contrib/extensions/i18n: pom.xml src/test/java/org/apache/sling/i18n/impl/JcrResourceBundleTest.java

svn commit: r881345 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling: AdapterManagerTestHelper.java MockAdapterFactory.java

svn commit: r881351 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling: adapter/ commons/testing/sling/SlingTestHelper.java

4 matches

Site Navigation

Mail list logo

Footer information