svn commit: r1477870 - /sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: rombert Date: Tue Apr 30 23:17:37 2013 New Revision: 1477870 URL: http://svn.apache.org/r1477870 Log: SLING-2847 : Installer integration tests fail due to unresolvable artifacts Since pax-exam does not support the maven.repo.local system property, add support for it in OsgiInstallerTestBase. Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1477870r1=1477869r2=1477870view=diff == --- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Apr 30 23:17:37 2013 @@ -24,6 +24,7 @@ import static org.ops4j.pax.exam.CoreOpt import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import static org.ops4j.pax.exam.CoreOptions.when; import java.io.File; import java.io.FileInputStream; @@ -39,6 +40,7 @@ import javax.inject.Inject; import org.apache.sling.installer.api.InstallableResource; import org.apache.sling.installer.api.OsgiInstaller; +import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -391,8 +393,13 @@ class OsgiInstallerTestBase implements F vmOpt += -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address= + paxDebugPort; } + String localRepo = System.getProperty(maven.repo.local, ); + return options( junitBundles(), +when( localRepo.length() 0 ).useOptions( + systemProperty(org.ops4j.pax.url.mvn.localRepository).value(localRepo) +), systemProperty( org.ops4j.pax.logging.DefaultServiceLog.level ).value(paxDebugLevel), provision( mavenBundle(org.apache.felix, org.apache.felix.scr, 1.6.0),
svn commit: r1477924 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert Date: Wed May 1 07:53:39 2013 New Revision: 1477924 URL: http://svn.apache.org/r1477924 Log: SLING-2848 : Event integration tests fail due to unresolvable artifacts Added support for the maven.repo.local system property in AbstractJobHandlingTest. The tests fail for me locally since they reference a snapshot artifact - org.apache.sling.jcr.jackrabbit.server - but let's see if this fixes the build on Jenkins. Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1477924r1=1477923r2=1477924view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Wed May 1 07:53:39 2013 @@ -22,6 +22,8 @@ package org.apache.sling.event.it; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import static org.ops4j.pax.exam.CoreOptions.when; import java.io.File; import java.io.IOException; @@ -68,7 +70,12 @@ public abstract class AbstractJobHandlin + BUNDLE_JAR_SYS_PROP + system property ); } +String localRepo = System.getProperty(maven.repo.local, ); + return options( +when( localRepo.length() 0 ).useOptions( + systemProperty(org.ops4j.pax.url.mvn.localRepository).value(localRepo) +), mavenBundle(org.apache.sling, org.apache.sling.fragment.xml, 1.0.2), mavenBundle(org.apache.sling, org.apache.sling.fragment.transaction, 1.0.0), mavenBundle(org.apache.sling, org.apache.sling.fragment.activation, 1.0.2),
svn commit: r1477948 - in /sling/trunk/testing/samples/integration-tests: pom.xml src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
Author: rombert
Date: Wed May 1 11:19:53 2013
New Revision: 1477948
URL: http://svn.apache.org/r1477948
Log:
SLING-2849 : Sample integration tests fail on Java 7
Use the 7-SNAPSHOT version of the launchpad for integration tests since
it supports Java 7. Also removed the /system/console/shell check from
OsgiConsoleTest since it doesn't seem to be included in the launchpad
anymore.
Modified:
sling/trunk/testing/samples/integration-tests/pom.xml
sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
Modified: sling/trunk/testing/samples/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1477948r1=1477947r2=1477948view=diff
==
--- sling/trunk/testing/samples/integration-tests/pom.xml (original)
+++ sling/trunk/testing/samples/integration-tests/pom.xml Wed May 1 11:19:53
2013
@@ -305,7 +305,7 @@
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.launchpad/artifactId
classifierstandalone/classifier
-version6/version
+version7-SNAPSHOT/version
/dependency
dependency
groupIdorg.slf4j/groupId
Modified:
sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java?rev=1477948r1=1477947r2=1477948view=diff
==
---
sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
(original)
+++
sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/http/OsgiConsoleTest.java
Wed May 1 11:19:53 2013
@@ -35,8 +35,7 @@ public class OsgiConsoleTest extends Sli
licenses,
logs,
memoryusage,
-services,
-shell
+services
};
for(String subpath : subpaths) {
svn commit: r1479937 - in /sling/trunk: bundles/auth/form/pom.xml bundles/commons/classloader/pom.xml bundles/commons/threads/pom.xml bundles/scripting/api/pom.xml launchpad/test-fragment/pom.xml
Author: rombert Date: Tue May 7 15:13:05 2013 New Revision: 1479937 URL: http://svn.apache.org/r1479937 Log: SLING-2858 - Maven build fails after upgrading to parent 16: No annotation processors found in classpath Add explicit org.apache.felix.scr.annotations dependency where needed. Modified: sling/trunk/bundles/auth/form/pom.xml sling/trunk/bundles/commons/classloader/pom.xml sling/trunk/bundles/commons/threads/pom.xml sling/trunk/bundles/scripting/api/pom.xml sling/trunk/launchpad/test-fragment/pom.xml Modified: sling/trunk/bundles/auth/form/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=1479937r1=1479936r2=1479937view=diff == --- sling/trunk/bundles/auth/form/pom.xml (original) +++ sling/trunk/bundles/auth/form/pom.xml Tue May 7 15:13:05 2013 @@ -96,6 +96,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.core/artifactId version1.1.0/version Modified: sling/trunk/bundles/commons/classloader/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/pom.xml?rev=1479937r1=1479936r2=1479937view=diff == --- sling/trunk/bundles/commons/classloader/pom.xml (original) +++ sling/trunk/bundles/commons/classloader/pom.xml Tue May 7 15:13:05 2013 @@ -128,6 +128,10 @@ /reporting dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.slf4j/groupId artifactIdslf4j-api/artifactId /dependency Modified: sling/trunk/bundles/commons/threads/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/pom.xml?rev=1479937r1=1479936r2=1479937view=diff == --- sling/trunk/bundles/commons/threads/pom.xml (original) +++ sling/trunk/bundles/commons/threads/pom.xml Tue May 7 15:13:05 2013 @@ -84,6 +84,10 @@ /reporting dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.osgi/groupId artifactIdorg.osgi.core/artifactId /dependency Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1479937r1=1479936r2=1479937view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Tue May 7 15:13:05 2013 @@ -67,6 +67,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdjavax.servlet/groupId artifactIdservlet-api/artifactId /dependency Modified: sling/trunk/launchpad/test-fragment/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-fragment/pom.xml?rev=1479937r1=1479936r2=1479937view=diff == --- sling/trunk/launchpad/test-fragment/pom.xml (original) +++ sling/trunk/launchpad/test-fragment/pom.xml Tue May 7 15:13:05 2013 @@ -68,4 +68,11 @@ /plugin /plugins /build + +dependencies +dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +/dependencies /project
svn commit: r1479939 - in /sling/trunk/contrib/scripting: freemarker/pom.xml xproc/pom.xml
Author: rombert Date: Tue May 7 15:18:45 2013 New Revision: 1479939 URL: http://svn.apache.org/r1479939 Log: SLING-2858 - Maven build fails after upgrading to parent 16: No annotation processors found in classpath Add explicit org.apache.felix.scr.annotations dependency where needed. Modified: sling/trunk/contrib/scripting/freemarker/pom.xml sling/trunk/contrib/scripting/xproc/pom.xml Modified: sling/trunk/contrib/scripting/freemarker/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1479939r1=1479938r2=1479939view=diff == --- sling/trunk/contrib/scripting/freemarker/pom.xml (original) +++ sling/trunk/contrib/scripting/freemarker/pom.xml Tue May 7 15:18:45 2013 @@ -101,6 +101,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId version2.0.8/version Modified: sling/trunk/contrib/scripting/xproc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/xproc/pom.xml?rev=1479939r1=1479938r2=1479939view=diff == --- sling/trunk/contrib/scripting/xproc/pom.xml (original) +++ sling/trunk/contrib/scripting/xproc/pom.xml Tue May 7 15:18:45 2013 @@ -68,6 +68,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.api/artifactId version2.0.8/version
svn commit: r1480072 - in /sling/trunk/samples: accessmanager-ui/pom.xml javashell/pom.xml usermanager-ui/pom.xml webloader/ui/pom.xml
Author: rombert Date: Tue May 7 20:53:05 2013 New Revision: 1480072 URL: http://svn.apache.org/r1480072 Log: SLING-2858 - Maven build fails after upgrading to parent 16: No annotation processors found in classpath Add explicit org.apache.felix.scr.annotations dependency where needed. Modified: sling/trunk/samples/accessmanager-ui/pom.xml sling/trunk/samples/javashell/pom.xml sling/trunk/samples/usermanager-ui/pom.xml sling/trunk/samples/webloader/ui/pom.xml Modified: sling/trunk/samples/accessmanager-ui/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/accessmanager-ui/pom.xml?rev=1480072r1=1480071r2=1480072view=diff == --- sling/trunk/samples/accessmanager-ui/pom.xml (original) +++ sling/trunk/samples/accessmanager-ui/pom.xml Tue May 7 20:53:05 2013 @@ -162,5 +162,9 @@ /reporting dependencies +dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency /dependencies /project Modified: sling/trunk/samples/javashell/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/javashell/pom.xml?rev=1480072r1=1480071r2=1480072view=diff == --- sling/trunk/samples/javashell/pom.xml (original) +++ sling/trunk/samples/javashell/pom.xml Tue May 7 20:53:05 2013 @@ -78,5 +78,10 @@ /plugins /reporting -dependencies/ +dependencies +dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +/dependencies /project Modified: sling/trunk/samples/usermanager-ui/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/pom.xml?rev=1480072r1=1480071r2=1480072view=diff == --- sling/trunk/samples/usermanager-ui/pom.xml (original) +++ sling/trunk/samples/usermanager-ui/pom.xml Tue May 7 20:53:05 2013 @@ -135,6 +135,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.apache.jackrabbit/groupId artifactIdjackrabbit-api/artifactId version2.2.5/version Modified: sling/trunk/samples/webloader/ui/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/webloader/ui/pom.xml?rev=1480072r1=1480071r2=1480072view=diff == --- sling/trunk/samples/webloader/ui/pom.xml (original) +++ sling/trunk/samples/webloader/ui/pom.xml Tue May 7 20:53:05 2013 @@ -77,4 +77,11 @@ /plugin /plugins /reporting + +dependencies +dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +/dependencies /project
svn commit: r1483951 - /sling/trunk/launchpad/testing-war/pom.xml
Author: rombert Date: Fri May 17 18:59:33 2013 New Revision: 1483951 URL: http://svn.apache.org/r1483951 Log: SLING-2858 - Maven build fails after upgrading to parent 16: No annotation processors found in classpath Add explicit org.apache.felix.scr.annotations dependency where needed. Modified: sling/trunk/launchpad/testing-war/pom.xml Modified: sling/trunk/launchpad/testing-war/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1483951r1=1483950r2=1483951view=diff == --- sling/trunk/launchpad/testing-war/pom.xml (original) +++ sling/trunk/launchpad/testing-war/pom.xml Fri May 17 18:59:33 2013 @@ -457,6 +457,10 @@ dependencies dependency +groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.scr.annotations/artifactId +/dependency +dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.integration-tests/artifactId version1.0.1-SNAPSHOT/version
svn commit: r1485858 - /sling/site/trunk/content/project-information.mdtext
Author: rombert Date: Thu May 23 21:27:41 2013 New Revision: 1485858 URL: http://svn.apache.org/r1485858 Log: Project information: indicate StackOverflow as a possible support forum. Modified: sling/site/trunk/content/project-information.mdtext Modified: sling/site/trunk/content/project-information.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/project-information.mdtext?rev=1485858r1=1485857r2=1485858view=diff == --- sling/site/trunk/content/project-information.mdtext (original) +++ sling/site/trunk/content/project-information.mdtext Thu May 23 21:27:41 2013 @@ -15,6 +15,8 @@ This document provides an overview of th These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link. +The Sling Users List is the preferred way of getting help with Sling. However, you can also [Ask a Sling question on StackOverflow](http://stackoverflow.com/questions/ask?tags=sling) if you prefer. + | Name | Subscribe | Unsubscribe | Post | Archive | Other Archives | |--|--|--|--|--|--| | Sling Users List | [Subscribe](mailto:users-subscr...@sling.apache.org) | [Unsubscribe](mailto:users-unsubscr...@sling.apache.org) | users at sling.apache.org | [mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/sling-users/) | [www.mail-archive.com](http://www.mail-archive.com/users@sling.apache.org/) [MarkMail](http://sling.markmail.org) [Nabble](http://apache-sling.73963.n3.nabble.com/Sling-Users-f73968.html) |
svn commit: r1486953 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Tue May 28 15:05:48 2013 New Revision: 1486953 URL: http://svn.apache.org/r1486953 Log: SLING-2888 - Downgrade SCR to 1.6.0 Downgrade to SCR 1.6.0 until 1.8.0, since 1.6.2 breaks the SlingPostServlet. Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1486953r1=1486952r2=1486953view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue May 28 15:05:48 2013 @@ -405,7 +405,7 @@ bundle groupIdorg.apache.felix/groupId artifactIdorg.apache.felix.scr/artifactId -version1.6.2/version +version1.6.0/version /bundle bundle groupIdorg.apache.felix/groupId
svn commit: r1489337 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java test-services/src/main/java/org/apache/sling/launch
Author: rombert
Date: Tue Jun 4 08:40:10 2013
New Revision: 1489337
URL: http://svn.apache.org/r1489337
Log:
SLING-2893 - Add documentation and integration tests to verify XML
parsing functionality
Added DomTest
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
(with props)
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java
(with props)
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java?rev=1489337view=auto
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
(added)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
Tue Jun 4 08:40:10 2013
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.webapp.integrationtest.xml;
+
+import java.io.IOException;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/**
+ * The ttDomTest/tt verifies that simple DOM executions are successful
+ *
+ */
+public class DomTest extends HttpTestBase {
+
+
+public void testDomExecutionIsSuccessful() throws IOException {
+
+String content = getContent(HTTP_BASE_URL + /bin/dom.xml,
CONTENT_TYPE_PLAIN);
+
+assertEquals(content, DOM);
+}
+
+}
Propchange:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
--
svn:eol-style = native
Propchange:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
--
svn:keywords = Author Date Id Revision Rev URL
Added:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java?rev=1489337view=auto
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java
(added)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java
Tue Jun 4 08:40:10 2013
@@ -0,0 +1,73 @@
+/*
+ *
+ * ADOBE CONFIDENTIAL
+ * __
+ *
+ * Copyright 2013 Adobe Systems Incorporated
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe Systems Incorporated and its suppliers,
+ * if any. The intellectual and technical concepts contained
+ * herein are proprietary to Adobe Systems Incorporated and its
+ * suppliers and are protected by trade secret or copyright law.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe Systems Incorporated.
+ **/
+package org.apache.sling.launchpad.testservices.servlets;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.servlet.ServletException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import
svn commit: r1489350 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java test-services/src/main/java/org/apache/sling/launch
Author: rombert
Date: Tue Jun 4 09:10:51 2013
New Revision: 1489350
URL: http://svn.apache.org/r1489350
Log:
SLING-2893 - Add documentation and integration tests to verify XML
parsing functionality
Added a SaxTest
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
(with props)
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java
(with props)
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java?rev=1489350view=auto
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
(added)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
Tue Jun 4 09:10:51 2013
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.webapp.integrationtest.xml;
+
+import java.io.IOException;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/**
+ * The ttSaxTest/tt verifies that a simple SAX operation is successful
+ *
+ */
+public class SaxTest extends HttpTestBase {
+
+public void testSaxExecutionIsSuccessful() throws IOException {
+
+String content = getContent(HTTP_BASE_URL + /bin/sax.xml,
CONTENT_TYPE_PLAIN);
+
+assertEquals(content, SAX);
+}
+
+}
Propchange:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
--
svn:eol-style = native
Propchange:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
--
svn:keywords = Author Date Id Revision Rev URL
Added:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java?rev=1489350view=auto
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java
(added)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java
Tue Jun 4 09:10:51 2013
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.testservices.servlets;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.servlet.ServletException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.xpath.XPathExpressionException;
+
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import
svn commit: r1489379 - in /sling/site/trunk/content/documentation: bundles.mdtext bundles/xml-support.mdtext
Author: rombert
Date: Tue Jun 4 10:43:40 2013
New Revision: 1489379
URL: http://svn.apache.org/r1489379
Log:
SLING-2893 - Add documentation and integration tests to verify XML
parsing functionality
Add a little documentation regarding XML support.
Added:
sling/site/trunk/content/documentation/bundles/xml-support.mdtext
Modified:
sling/site/trunk/content/documentation/bundles.mdtext
Modified: sling/site/trunk/content/documentation/bundles.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles.mdtext?rev=1489379r1=1489378r2=1489379view=diff
==
--- sling/site/trunk/content/documentation/bundles.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles.mdtext Tue Jun 4 10:43:40
2013
@@ -31,3 +31,4 @@ Title: Bundles
* [Scheduler Service (commons scheduler)]({{
refs.scheduler-service-commons-scheduler.path }})
* [Web Console Extensions (org.apache.sling.extensions.webconsolebranding,
org.apache.sling.extensions.webconsolesecurityprovider)]({{
refs.web-console-extensions.path }})
* [Discovery API and its Implementations (discovery.api, discovery.impl)]({{
refs.discovery-api-and-impl.path }})
+* [XML Support]({{ refs.xml-support.xml }})
\ No newline at end of file
Added: sling/site/trunk/content/documentation/bundles/xml-support.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/xml-support.mdtext?rev=1489379view=auto
==
--- sling/site/trunk/content/documentation/bundles/xml-support.mdtext (added)
+++ sling/site/trunk/content/documentation/bundles/xml-support.mdtext Tue Jun
4 10:43:40 2013
@@ -0,0 +1,8 @@
+Title: XML support
+Excerpt: XML mechanisms supported by Sling
+
+Out of the box, Sling provides no special bundles for XML. However, Sling
supports multiple mechanisms and libraries. The ones we have validated with
integration tests are:
+
+# XPath ( see the
[XPathServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/XpathServlet.java))
+# SAX ( see the
[SaxServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java))
+# DOM ( see the
[DomServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java))
\ No newline at end of file
svn commit: r1489382 - /sling/site/trunk/content/documentation/bundles.mdtext
Author: rombert
Date: Tue Jun 4 10:47:42 2013
New Revision: 1489382
URL: http://svn.apache.org/r1489382
Log:
SLING-2893 - Add documentation and integration tests to verify XML
parsing functionality
Fixed link to page from bundles page.
Modified:
sling/site/trunk/content/documentation/bundles.mdtext
Modified: sling/site/trunk/content/documentation/bundles.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles.mdtext?rev=1489382r1=1489381r2=1489382view=diff
==
--- sling/site/trunk/content/documentation/bundles.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles.mdtext Tue Jun 4 10:47:42
2013
@@ -31,4 +31,4 @@ Title: Bundles
* [Scheduler Service (commons scheduler)]({{
refs.scheduler-service-commons-scheduler.path }})
* [Web Console Extensions (org.apache.sling.extensions.webconsolebranding,
org.apache.sling.extensions.webconsolesecurityprovider)]({{
refs.web-console-extensions.path }})
* [Discovery API and its Implementations (discovery.api, discovery.impl)]({{
refs.discovery-api-and-impl.path }})
-* [XML Support]({{ refs.xml-support.xml }})
\ No newline at end of file
+* [XML Support]({{ refs.xml-support.path }})
\ No newline at end of file
svn commit: r1489383 - /sling/site/trunk/content/documentation/bundles/xml-support.mdtext
Author: rombert Date: Tue Jun 4 10:48:59 2013 New Revision: 1489383 URL: http://svn.apache.org/r1489383 Log: SLING-2893 - Add documentation and integration tests to verify XML parsing functionality Fixed list syntax Modified: sling/site/trunk/content/documentation/bundles/xml-support.mdtext Modified: sling/site/trunk/content/documentation/bundles/xml-support.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/xml-support.mdtext?rev=1489383r1=1489382r2=1489383view=diff == --- sling/site/trunk/content/documentation/bundles/xml-support.mdtext (original) +++ sling/site/trunk/content/documentation/bundles/xml-support.mdtext Tue Jun 4 10:48:59 2013 @@ -3,6 +3,6 @@ Excerpt: XML mechanisms supported by Sli Out of the box, Sling provides no special bundles for XML. However, Sling supports multiple mechanisms and libraries. The ones we have validated with integration tests are: -# XPath ( see the [XPathServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/XpathServlet.java)) -# SAX ( see the [SaxServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java)) -# DOM ( see the [DomServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java)) \ No newline at end of file +* XPath ( see the [XPathServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/XpathServlet.java) ) +* SAX ( see the [SaxServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SaxServlet.java) ) +* DOM ( see the [DomServlet](http://svn.apache.org/repos/asf/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/DomServlet.java) ) \ No newline at end of file
svn commit: r1498530 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Mon Jul 1 15:54:43 2013 New Revision: 1498530 URL: http://svn.apache.org/r1498530 Log: SLING-2941 - Replace the javax.activation fragment with the javax.activation bundle Update the bundle list to refer to the javax.activation bundle. Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1498530r1=1498529r2=1498530view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Jul 1 15:54:43 2013 @@ -299,8 +299,8 @@ /bundle bundle groupIdorg.apache.sling/groupId -artifactIdorg.apache.sling.fragment.activation/artifactId -version1.0.2/version +artifactIdorg.apache.sling.javax.activation/artifactId +version0.1.0/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1500670 - in /sling/trunk/bundles/extensions/discovery/impl: pom.xml src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java
Author: rombert
Date: Mon Jul 8 11:33:09 2013
New Revision: 1500670
URL: http://svn.apache.org/r1500670
Log:
SLING-2945 - ClusterLoadTest failures
Replaced Thread.sleep usage with RetryLoop to make the testing runs more
predictable.
Also, wrap dumpRepo calls in try/catch calls since they previously
failed due to (probably) concurrent repo access.
Modified:
sling/trunk/bundles/extensions/discovery/impl/pom.xml
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java
Modified: sling/trunk/bundles/extensions/discovery/impl/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/pom.xml?rev=1500670r1=1500669r2=1500670view=diff
==
--- sling/trunk/bundles/extensions/discovery/impl/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/impl/pom.xml Mon Jul 8 11:33:09
2013
@@ -179,5 +179,11 @@
typebundle/type
scopetest/scope
/dependency
+dependency
+groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.testing.tools/artifactId
+version1.0.2/version
+scopetest/scope
+/dependency
/dependencies
/project
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java?rev=1500670r1=1500669r2=1500670view=diff
==
---
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java
(original)
+++
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterLoadTest.java
Mon Jul 8 11:33:09 2013
@@ -11,6 +11,7 @@ import java.util.Random;
import
org.apache.sling.discovery.impl.common.resource.EstablishedInstanceDescription;
import
org.apache.sling.discovery.impl.common.resource.IsolatedInstanceDescription;
import org.apache.sling.discovery.impl.setup.Instance;
+import org.apache.sling.testing.tools.retry.RetryLoop;
import org.junit.After;
import org.junit.Test;
import org.slf4j.Logger;
@@ -18,7 +19,11 @@ import org.slf4j.LoggerFactory;
public class ClusterLoadTest {
- private final Random random = new Random();
+// wait up to 4 heartbeat intervals
+private static final int INSTANCE_VIEW_WAIT_TIME_MILLIS = 5000;
+private static final int INSTANCE_VIEW_POLL_INTERVAL_MILLIS = 500;
+
+private final Random random = new Random();
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -109,8 +114,6 @@ public class ClusterLoadTest {
logger.info(=);
logger.info( START of LOOP +i);
logger.info(=);
- // wait 4 heartbeat intervals to let things settle
- Thread.sleep(5000);
// count how many instances had heartbeats running in
the first place
int aliveCnt = 0;
@@ -128,21 +131,27 @@ public class ClusterLoadTest {
aliveCnt=1;
}
+final int aliveCntFinal = aliveCnt;
+
for (IteratorInstance it = instances.iterator();
it.hasNext();) {
Instance instance = it.next();
- instance.dumpRepo();
+ try {
+instance.dumpRepo();
+} catch (Exception e) {
+logger.error(Failed dumping repo for instance +
instance.getSlingId(), e);
+}
}
// then verify that each instance sees that many
instances
for (IteratorInstance it = instances.iterator();
it.hasNext();) {
- Instance instance = it.next();
- int actualCount =
instance.getClusterViewService().getClusterView().getInstances().size();
+final Instance instance = it.next();
if (!instance.isHeartbeatRunning()) {
// if the heartbeat is not running,
this instance is considered dead
// hence we're not doing any assert
here (as the count is only
// valid if heartbeat/checkView is
running and that would void the test)
} else {
- assertEquals(actualCount, aliveCnt
svn commit: r1500794 - in /sling/trunk/maven/archetypes/servlet/src: main/resources/archetype-resources/pom.xml test/resources/projects/normal/reference/pom.xml
Author: rombert Date: Mon Jul 8 15:16:11 2013 New Revision: 1500794 URL: http://svn.apache.org/r1500794 Log: servlet archetype: set source encoding to prevent build warnings Modified: sling/trunk/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml sling/trunk/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml Modified: sling/trunk/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml?rev=1500794r1=1500793r2=1500794view=diff == --- sling/trunk/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml (original) +++ sling/trunk/maven/archetypes/servlet/src/main/resources/archetype-resources/pom.xml Mon Jul 8 15:16:11 2013 @@ -104,6 +104,10 @@ scopetest/scope /dependency /dependencies +properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding +/properties profiles profile idautoInstallBundle/id Modified: sling/trunk/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml?rev=1500794r1=1500793r2=1500794view=diff == --- sling/trunk/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml (original) +++ sling/trunk/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml Mon Jul 8 15:16:11 2013 @@ -104,6 +104,10 @@ scopetest/scope /dependency /dependencies +properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding +/properties profiles profile idautoInstallBundle/id
svn propchange: r1500794 - svn:log
Author: rombert Revision: 1500794 Modified property: svn:log Modified: svn:log at Mon Jul 8 15:44:50 2013 -- --- svn:log (original) +++ svn:log Mon Jul 8 15:44:50 2013 @@ -1 +1,3 @@ -servlet archetype: set source encoding to prevent build warnings +SLING-2948 - Servlet archetype - set encoding for generated project + +This prevents build warnings from being issued.
svn commit: r1500984 - in /sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing: LoggingSuite.java TestAll.java
Author: rombert
Date: Mon Jul 8 21:56:22 2013
New Revision: 1500984
URL: http://svn.apache.org/r1500984
Log:
SLING-2903 - launchpad/testing TestSuite fails with JUnit 4 tests
Also fixed launchpad/testing-war to work with JUnit 4 tests.
Modified:
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/LoggingSuite.java
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/TestAll.java
Modified:
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/LoggingSuite.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/LoggingSuite.java?rev=1500984r1=1500983r2=1500984view=diff
==
---
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/LoggingSuite.java
(original)
+++
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/LoggingSuite.java
Mon Jul 8 21:56:22 2013
@@ -32,10 +32,8 @@
*/
package org.apache.sling.launchpad.testing;
-import java.util.Set;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
@@ -54,8 +52,8 @@ class LoggingSuite extends TestSuite {
private int lastFailures;
-LoggingSuite(SetClassTestCase classSet, String name, Logger logger) {
-super(classSet.toArray(new Class[classSet.size()]), name);
+LoggingSuite(String name, Logger logger) {
+super(name);
this.logger = logger;
}
@@ -67,9 +65,7 @@ class LoggingSuite extends TestSuite {
@Override
public void runTest(Test test, TestResult result) {
-final String name = (test instanceof TestSuite)
-? ((TestSuite) test).getName()
-: test.getClass().getName();
+final String name = getName(test);
final String startMessage = String.format(Running %s, name);
System.out.println(startMessage);
logger.info(startMessage);
@@ -89,4 +85,9 @@ class LoggingSuite extends TestSuite {
lastErrors = result.errorCount();
}
+
+private String getName(Test t) {
+return (t instanceof TestSuite) ? ((TestSuite) t).getName() : t
+.toString();
+}
}
Modified:
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/TestAll.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/TestAll.java?rev=1500984r1=1500983r2=1500984view=diff
==
---
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/TestAll.java
(original)
+++
sling/trunk/launchpad/testing-war/src/test/java/org/apache/sling/launchpad/testing/TestAll.java
Mon Jul 8 21:56:22 2013
@@ -16,10 +16,12 @@
*/
package org.apache.sling.launchpad.testing;
-import junit.framework.Test;
+import junit.framework.JUnit4TestAdapter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.AllTests;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,11 +43,12 @@ import java.util.regex.Pattern;
/**
*
*/
+@RunWith(AllTests.class)
public class TestAll extends TestCase {
private static final Logger LOGGER =
LoggerFactory.getLogger(TestAll.class);
@SuppressWarnings(unchecked)
-public static Test suite() {
+public static TestSuite suite() {
final ClassLoader sysClassLoader = TestAll.class.getClassLoader();
final ListString matchingClasses = new ArrayListString();
// Get the URLs
@@ -63,6 +66,9 @@ public class TestAll extends TestCase {
e.printStackTrace();
}
}
+
+TestSuite suite = new LoggingSuite(Sling Integration Tests matching
+ testPattern, LOGGER);
+int counter = 0;
final SetClassTestCase classSet = new HashSetClassTestCase();
for (String classFile : matchingClasses) {
String className = classFileToName(classFile);
@@ -70,16 +76,18 @@ public class TestAll extends TestCase {
final ClassTestCase c = (ClassTestCase)
sysClassLoader.loadClass(className);
if (!c.isInterface()
!Modifier.isAbstract(c.getModifiers())) {
LOGGER.info(Added + className);
-classSet.add(c);
+suite.addTest(new JUnit4TestAdapter(c));
+counter++;
}
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
+if ( counter == 0 ) {
+fail(No test classes found in classpath using Pattern +
testRegex);
+}
LOGGER.info(classSet.size
svn commit: r1501114 - /sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Author: rombert
Date: Tue Jul 9 07:21:43 2013
New Revision: 1501114
URL: http://svn.apache.org/r1501114
Log:
SLING-2953 - Healthcheck pax-exam setup does not check for
maven.repo.local
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Modified:
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1501114r1=1501113r2=1501114view=diff
==
---
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++
sling/trunk/contrib/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Tue Jul 9 07:21:43 2013
@@ -22,6 +22,8 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.IOException;
import java.io.StringReader;
@@ -37,9 +39,13 @@ public class U {
static Option[] config(boolean includeRules) {
final String coreVersion = System.getProperty(sling.hc.core.version);
+String localRepo = System.getProperty(maven.repo.local, );
if(includeRules) {
return options(
+when(localRepo.length() 0).useOptions(
+
systemProperty(org.ops4j.pax.url.mvn.localRepository).value(localRepo)
+),
junitBundles(),
provision(
mavenBundle(org.apache.sling,
org.apache.sling.hc.core, coreVersion),
@@ -48,6 +54,9 @@ public class U {
);
} else {
return options(
+when(localRepo.length() 0).useOptions(
+
systemProperty(org.ops4j.pax.url.mvn.localRepository).value(localRepo)
+),
junitBundles(),
provision(
mavenBundle(org.apache.sling,
org.apache.sling.hc.core, coreVersion)
svn commit: r1501133 - /sling/trunk/bundles/extensions/event/pom.xml
Author: rombert
Date: Tue Jul 9 08:36:30 2013
New Revision: 1501133
URL: http://svn.apache.org/r1501133
Log:
SLING-2954 - Event ITs spuriosly fail on Jenkins
Assign a random port for the OSGi HTTP service when running Event ITs to
prevent collisions.
Modified:
sling/trunk/bundles/extensions/event/pom.xml
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1501133r1=1501132r2=1501133view=diff
==
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Jul 9 08:36:30 2013
@@ -106,6 +106,10 @@
nameproject.bundle.file/name
value${bundle.file.name}/value
/property
+property
+nameorg.osgi.service.http.port/name
+value${http.port}/value
+/property
/systemProperties
argLine
-Xmx1024m -XX:MaxPermSize=368m
@@ -116,6 +120,24 @@
/configuration
/plugin
plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdbuild-helper-maven-plugin/artifactId
+executions
+execution
+idreserve-network-port/id
+goals
+goalreserve-network-port/goal
+/goals
+phasepre-integration-test/phase
+configuration
+portNames
+portNamehttp.port/portName
+/portNames
+/configuration
+/execution
+/executions
+/plugin
+plugin
artifactIdmaven-clean-plugin/artifactId
configuration
filesets
svn commit: r1501285 - in /sling/trunk/launchpad: builder/src/main/bundles/ integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/
Author: rombert
Date: Tue Jul 9 14:18:40 2013
New Revision: 1501285
URL: http://svn.apache.org/r1501285
Log:
SLING-2924 - Full text extraction issue with Tika v1.0 under OSGi
environment
Update Tika bundles to version 1.2 and add an integration test to verify
that the full text search is available. This test failed with the 1.0
version of the bundles.
Thanks to Anjan for debugging the problem and suggesting a fix.
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
(with props)
Modified:
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1501285r1=1501284r2=1501285view=diff
==
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jul 9 14:18:40
2013
@@ -458,12 +458,12 @@
bundle
groupIdorg.apache.tika/groupId
artifactIdtika-core/artifactId
-version1.0/version
+version1.2/version
/bundle
bundle
groupIdorg.apache.tika/groupId
artifactIdtika-bundle/artifactId
-version1.0/version
+version1.2/version
/bundle
bundle
groupIdorg.apache.sling/groupId
Added:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java?rev=1501285view=auto
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
(added)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
Tue Jul 9 14:18:40 2013
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.webapp.integrationtest.indexing;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+
+import org.apache.sling.commons.json.JSONArray;
+import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.commons.json.JSONObject;
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+import org.apache.sling.testing.tools.retry.RetryLoop;
+import org.apache.sling.testing.tools.retry.RetryLoop.Condition;
+
+/**
+ * The ttFullTextIndexingTest/tt verifies that a PDF file which is
uploaded will have its contents indexed and
+ * available for full-text searches
+ *
+ */
+public class FullTextIndexingTest extends HttpTestBase {
+
+private String folderName;
+private String fileName = lorem-ipsum.pdf;
+
+public void testUploadedPdfIsIndexed() throws IOException, JSONException {
+
+String localPath = /integration-test/indexing/ + fileName;
+InputStream resourceToUpload =
getClass().getResourceAsStream(localPath);
+if (resourceToUpload == null)
+throw new IllegalArgumentException(No resource to upload found at
+ localPath);
+
+testClient.mkdir(WEBDAV_BASE_URL + / + folderName);
+testClient.upload(WEBDAV_BASE_URL + / + folderName + / + fileName,
resourceToUpload);
+
+final String fullTextSearchParameter = Excepteur;
+final String queryUrl = WEBDAV_BASE_URL +
/content.query.json?queryType=xpathstatement=
++ URLEncoder.encode(/jcr:root/ + folderName
++ //*[jcr:contains(.,' + fullTextSearchParameter+ ')],
UTF-8);
+
+new RetryLoop(new Condition() {
+
+public boolean isTrue() throws Exception
svn commit: r1501286 - in /sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing: ./ lorem-ipsum.pdf
Author: rombert Date: Tue Jul 9 14:22:22 2013 New Revision: 1501286 URL: http://svn.apache.org/r1501286 Log: SLING-2924 - Full text extraction issue with Tika v1.0 under OSGi environment Added missing test file. Added: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing/ sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing/lorem-ipsum.pdf (with props) Added: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing/lorem-ipsum.pdf URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing/lorem-ipsum.pdf?rev=1501286view=auto == Binary file - no diff available. Propchange: sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/indexing/lorem-ipsum.pdf -- svn:mime-type = application/pdf
svn commit: r1501298 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Tue Jul 9 14:42:10 2013 New Revision: 1501298 URL: http://svn.apache.org/r1501298 Log: SLING-2924 - Full text extraction issue with Tika v1.0 under OSGi environment Make sure that the tika bundles are available when jackrabbit is started. Otherwise when indexes are deleted they will not be rebuilt on startup. Thanks to Anjan for debugging the problem and suggesting a fix. Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1501298r1=1501297r2=1501298view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jul 9 14:42:10 2013 @@ -141,7 +141,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.servlets.post/artifactId -version2.3.3-SNAPSHOT/version +version2.3.1-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -161,7 +161,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.classloader/artifactId -version3.2.1-SNAPSHOT/version +version3.1.13-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -422,6 +422,16 @@ artifactIdorg.apache.felix.metatype/artifactId version1.0.6/version /bundle +bundle +groupIdorg.apache.tika/groupId +artifactIdtika-core/artifactId +version1.2/version +/bundle +bundle +groupIdorg.apache.tika/groupId +artifactIdtika-bundle/artifactId +version1.2/version +/bundle /startLevel startLevel level=15 @@ -456,16 +466,6 @@ version10.5.3.0_1/version /bundle bundle -groupIdorg.apache.tika/groupId -artifactIdtika-core/artifactId -version1.2/version -/bundle -bundle -groupIdorg.apache.tika/groupId -artifactIdtika-bundle/artifactId -version1.2/version -/bundle -bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.jackrabbit.server/artifactId version2.1.1-SNAPSHOT/version
svn commit: r1501355 - /sling/trunk/launchpad/testing-war/pom.xml
Author: rombert
Date: Tue Jul 9 16:01:32 2013
New Revision: 1501355
URL: http://svn.apache.org/r1501355
Log:
SLING-2852 - Sling Launchpad Testing WAR - ClassCircularityError when
executed in a reactor
pom.xml cleanups:
- remove unused maven-jetty-plugin
- remove plugin version overrides ( newer versions are inherited )
- use non-deprecated configuration syntax for the cargo-maven2-plugin
Modified:
sling/trunk/launchpad/testing-war/pom.xml
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1501355r1=1501354r2=1501355view=diff
==
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Tue Jul 9 16:01:32 2013
@@ -95,7 +95,6 @@
plugin
artifactIdmaven-clean-plugin/artifactId
-version2.2/version
configuration
filesets
fileset
@@ -148,39 +147,6 @@
/executions
/plugin
plugin
-groupIdorg.mortbay.jetty/groupId
-artifactIdmaven-jetty-plugin/artifactId
-configuration
-contextPath/${http.base.path}/contextPath
-scanIntervalSeconds
-${jetty.scan.interval.seconds}
-/scanIntervalSeconds
-
-systemProperties
-systemProperty
-nametest.sling.home/name
-value${jetty.sling.home}/value
-/systemProperty
-/systemProperties
-
-connectors
-connector
implementation=org.mortbay.jetty.nio.SelectChannelConnector
-port${jetty.http.port}/port
-maxIdleTime6/maxIdleTime
-/connector
-/connectors
-
-!--
-Use target/... as the webapp source, as we unpack
stuff there from the
-Sling launcher modules
---
-webAppSourceDirectory
-target/${project.artifactId}-${project.version}
-/webAppSourceDirectory
-/configuration
-/plugin
-
-plugin
groupIdorg.apache.sling/groupId
artifactIdmaven-launchpad-plugin/artifactId
version2.1.2/version
@@ -284,6 +250,13 @@
/test.sling.home
/systemProperties
/container
+deployables
+deployable
+properties
+context/${http.base.path}/context
+/properties
+/deployable
+/deployables
configuration
home${project.build.directory}/cargo/home
properties
@@ -294,13 +267,6 @@
cargo.jvmargs-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y/cargo.jvmargs
--
/properties
-deployables
-deployable
-properties
-context/${http.base.path}/context
-/properties
-/deployable
-/deployables
/configuration
/configuration
/plugin
svn commit: r1501356 - /sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java
Author: rombert Date: Tue Jul 9 16:02:39 2013 New Revision: 1501356 URL: http://svn.apache.org/r1501356 Log: SLING-2957 - IT failures in FailingServerTests Make assertions more precise to prevent false matches from coming up. Modified: sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java Modified: sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java?rev=1501356r1=1501355r2=1501356view=diff == --- sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java (original) +++ sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/FailingTestsTest.java Tue Jul 9 16:02:39 2013 @@ -81,7 +81,7 @@ public class FailingTestsTest extends Se assertEquals( testFailsEveryTime(org.apache.sling.testing.samples.failingtests.JUnit4FailingTest): This JUnit4 test fails every time, -getFailure(json, org.apache.sling.testing.samples.failingtests.JUnit4FailingTest) +getFailure(json, testFailsEveryTime(org.apache.sling.testing.samples.failingtests.JUnit4FailingTest) ); assertEquals(
svn commit: r1501393 - /sling/trunk/bundles/extensions/event/pom.xml
Author: rombert
Date: Tue Jul 9 17:21:35 2013
New Revision: 1501393
URL: http://svn.apache.org/r1501393
Log:
SLING-2954 - Event ITs spuriosly fail on Jenkins
Update pax-exam version and pax-url versions to be similar to the
healthcheck and installer ITs. Not sure if it will do good, but it
definitely won't hurt.
Modified:
sling/trunk/bundles/extensions/event/pom.xml
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1501393r1=1501392r2=1501393view=diff
==
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Jul 9 17:21:35 2013
@@ -45,8 +45,8 @@
properties
site.jira.version.id12315369/site.jira.version.id
sling.java.version6/sling.java.version
-exam.version2.5.0/exam.version
-url.version1.4.0/url.version
+exam.version3.0.3/exam.version
+url.version1.5.2/url.version
bundle.build.name${basedir}/target/bundle.build.name
bundle.file.name${bundle.build.name}/${project.build.finalName}.jar/bundle.file.name
/properties
svn commit: r1501673 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
Author: rombert
Date: Wed Jul 10 08:42:02 2013
New Revision: 1501673
URL: http://svn.apache.org/r1501673
Log:
SLING-2959 - ErrorHandlingTest intermitent failures in setUp
Be more conservative about the paths which are deleted in tearDown(),
especially avoiding deleting the whole /apps node.
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java?rev=1501673r1=1501672r2=1501673view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
Wed Jul 10 08:42:02 2013
@@ -65,13 +65,15 @@ public class ErrorHandlingTest extends J
final MapString, String props = new HashMapString, String();
props.put(SLING_RESOURCE_TYPE, TEST_ROOT+/+THROW_ERROR_PATH);
- testNodePath = testClient.createNode(HTTP_BASE_URL + TEST_ROOT,
props);
+testNodePath = testClient.createNode(HTTP_BASE_URL + TEST_ROOT +
/testNode, props);
}
@Override
protected void tearDown() throws Exception {
- super.tearDown();
- testClient.delete(HTTP_BASE_URL + TEST_ROOT);
+testClient.delete(HTTP_BASE_URL + ERROR_HANDLER_PATH);
+testClient.delete(HTTP_BASE_URL + TEST_ROOT + / + THROW_ERROR_PATH);
+testClient.delete(testNodePath);
+super.tearDown();
}
svn commit: r1501716 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
Author: rombert
Date: Wed Jul 10 10:56:37 2013
New Revision: 1501716
URL: http://svn.apache.org/r1501716
Log:
SLING-2924 - Full text extraction issue with Tika v1.0 under OSGi
environment
Increased the timeout to 10 seconds to address Jenkins failures.
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java?rev=1501716r1=1501715r2=1501716view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
Wed Jul 10 10:56:37 2013
@@ -80,19 +80,19 @@ public class FullTextIndexingTest extend
public String getDescription() {
return A document containing ' + fullTextSearchParameter +
' is found under / + folderName;
}
-}, 5, 50);
+}, 10, 50);
}
protected void setUp() throws Exception {
super.setUp();
folderName = getClass().getSimpleName();
-testClient.delete(WEBDAV_BASE_URL + / + getClass().getSimpleName());
+testClient.delete(WEBDAV_BASE_URL + / + folderName);
}
protected void tearDown() throws Exception {
-testClient.delete(WEBDAV_BASE_URL + / + getClass().getSimpleName());
+testClient.delete(WEBDAV_BASE_URL + / + folderName);
super.tearDown();
}
}
svn commit: r1501850 - /sling/trunk/contrib/scripting/freemarker/pom.xml
Author: rombert Date: Wed Jul 10 16:58:36 2013 New Revision: 1501850 URL: http://svn.apache.org/r1501850 Log: SLING-2961 - Freemarker tests fail: java.lang.NoClassDefFoundError: javax/jcr/Binary Update pom dependencies to fix build. Modified: sling/trunk/contrib/scripting/freemarker/pom.xml Modified: sling/trunk/contrib/scripting/freemarker/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1501850r1=1501849r2=1501850view=diff == --- sling/trunk/contrib/scripting/freemarker/pom.xml (original) +++ sling/trunk/contrib/scripting/freemarker/pom.xml Wed Jul 10 16:58:36 2013 @@ -112,12 +112,12 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.0.2-incubator/version +version2.1.4/version /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.resource/artifactId -version2.0.6/version +version2.2.0/version exclusions exclusion groupIdorg.apache.jackrabbit/groupId @@ -136,6 +136,7 @@ dependency groupIdjavax.jcr/groupId artifactIdjcr/artifactId +version2.0/version /dependency dependency groupIdorg.freemarker/groupId
svn commit: r1501849 - /sling/trunk/contrib/launchpad/testing/pom.xml
Author: rombert
Date: Wed Jul 10 16:58:28 2013
New Revision: 1501849
URL: http://svn.apache.org/r1501849
Log:
SLING-2960 - Contrib integration tests fail: Sling services not available.
Already checked in earlier tests.
Clean up context path setup, similar to the launchpad/testing-war
project.
Modified:
sling/trunk/contrib/launchpad/testing/pom.xml
Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=1501849r1=1501848r2=1501849view=diff
==
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Wed Jul 10 16:58:28 2013
@@ -88,7 +88,6 @@
plugin
artifactIdmaven-clean-plugin/artifactId
-version2.2/version
configuration
filesets
fileset
@@ -139,44 +138,6 @@
/execution
/executions
/plugin
-plugin
-groupIdorg.mortbay.jetty/groupId
-artifactIdmaven-jetty-plugin/artifactId
-configuration
-contextPath//contextPath
-scanIntervalSeconds
-${jetty.scan.interval.seconds}
-/scanIntervalSeconds
-
-systemProperties
-systemProperty
-namesling.home/name
-value${jetty.sling.home}/value
-/systemProperty
-
-!-- jython uses this to place various stuff --
-systemProperty
-namepython.home/name
-value${jetty.sling.home}/python/value
-/systemProperty
-/systemProperties
-
-connectors
-connector
implementation=org.mortbay.jetty.nio.SelectChannelConnector
-port${jetty.http.port}/port
-maxIdleTime6/maxIdleTime
-/connector
-/connectors
-
-!--
-Use target/... as the webapp source, as we unpack
stuff there from the
-Sling launcher modules
---
-webAppSourceDirectory
-target/${artifactId}-${pom.version}
-/webAppSourceDirectory
-/configuration
-/plugin
plugin
groupIdorg.apache.sling/groupId
@@ -250,6 +211,12 @@
http://${test.host}:${http.port}/${webdav.workspace.path}
/value
/property
+property
+namelaunchpad.servlet.context/name
+value
+/${http.base.path}
+/value
+/property
/systemProperties
/configuration
/plugin
@@ -315,7 +282,7 @@
launchpad.http.server.url
/name
value
-
http://${test.host}:${http.port}/${project.build.finalName}
+
http://${test.host}:${http.port}/${http.base.path}
/value
/property
property
@@ -323,7 +290,7 @@
launchpad.webdav.server.url
/name
value
-
http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path}
+
http://${test.host}:${http.port}/${http.base.path}/${webdav.workspace.path}
/value
/property
@@ -362,6 +329,13 @@
/sling.home
/systemProperties
/container
+deployables
+deployable
+properties
+context/${http.base.path}/context
+/properties
+/deployable
+/deployables
configuration
svn commit: r1501973 - /sling/trunk/contrib/launchpad/testing/pom.xml
Author: rombert
Date: Wed Jul 10 20:32:06 2013
New Revision: 1501973
URL: http://svn.apache.org/r1501973
Log:
SLING-2960 - Contrib integration tests fail: Sling services not
available. Already checked in earlier tests.
Correct webdav url.
Modified:
sling/trunk/contrib/launchpad/testing/pom.xml
Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=1501973r1=1501972r2=1501973view=diff
==
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Wed Jul 10 20:32:06 2013
@@ -290,7 +290,7 @@
launchpad.webdav.server.url
/name
value
-
http://${test.host}:${http.port}/${http.base.path}/${webdav.workspace.path}
+
http://${test.host}:${http.port}/${webdav.workspace.path}
/value
/property
svn commit: r1501975 - /sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java
Author: rombert Date: Wed Jul 10 20:32:28 2013 New Revision: 1501975 URL: http://svn.apache.org/r1501975 Log: SLING-2960 - Contrib integration tests fail: Sling services not available. Already checked in earlier tests. Removed System.out call from XsltTest Modified: sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java Modified: sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java?rev=1501975r1=1501974r2=1501975view=diff == --- sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java (original) +++ sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/xproc/XsltTest.java Wed Jul 10 20:32:28 2013 @@ -126,7 +126,6 @@ public class XsltTest extends RenderingT // Render content and assertions final String content = getContent(mokeNodePath + .xml, CONTENT_TYPE_XML); - System.out.println(content); assertContains(content, no_xml); }
svn commit: r1501974 - /sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Author: rombert
Date: Wed Jul 10 20:32:17 2013
New Revision: 1501974
URL: http://svn.apache.org/r1501974
Log:
SLING-2960 - Contrib integration tests fail: Sling services not
available. Already checked in earlier tests.
Remove obsolete workaround from ScalaScriptingTest.
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java?rev=1501974r1=1501973r2=1501974view=diff
==
---
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
(original)
+++
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Wed Jul 10 20:32:17 2013
@@ -22,21 +22,6 @@ import org.apache.sling.commons.testing.
public class ScalaScriptingTest extends HttpTestBase {
-/**
- * The first request on a fresh Sling instance always fails with
- * javax.script.ScriptException: ERROR : error while loading ScriptHelper,
- * class file 'org/apache/sling/scripting/core/ScriptHelper.class' is
broken
- * (class org.osgi.framework.BundleContext not found.)
- *
- * For the time being this is a known issue. Until this is fixed this test
- * is here to catch this first request and make subsequent tests pass.
- * @throws IOException
- */
-public void testIgnore() throws IOException {
-String url = HTTP_BASE_URL + /content/helloworld.html;
-getContent(url, CONTENT_TYPE_HTML, null, 500);
-}
-
public void testHelloWorldApp() throws IOException {
String url = HTTP_BASE_URL + /content/helloworld.html;
String content = getContent(url, CONTENT_TYPE_HTML);
svn commit: r1502146 - /sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Author: rombert
Date: Thu Jul 11 08:23:14 2013
New Revision: 1502146
URL: http://svn.apache.org/r1502146
Log:
SLING-2960 - Contrib integration tests fail: Sling services not
available. Already checked in earlier tests.
Reinstate a more tolerant version of the workaround for the
ScalaScriptingTest, as it is still needed.
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Modified:
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java?rev=1502146r1=1502145r2=1502146view=diff
==
---
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
(original)
+++
sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/scala/ScalaScriptingTest.java
Thu Jul 11 08:23:14 2013
@@ -18,10 +18,34 @@ package org.apache.sling.launchpad.webap
import java.io.IOException;
+import junit.framework.AssertionFailedError;
+
import org.apache.sling.commons.testing.integration.HttpTestBase;
public class ScalaScriptingTest extends HttpTestBase {
+/*
+ * FIXME - workaround
+ *
+ * The first request on a fresh Sling instance always fails with
javax.script.ScriptException: ERROR : error while
+ * loading ScriptHelper, class file
'org/apache/sling/scripting/core/ScriptHelper.class' is broken (class
+ * org.osgi.framework.BundleContext not found.)
+ *
+ * For the time being this is a known issue. Until this is fixed this
method is here to make tests pass
+ *
+ * @throws IOException
+ */
+public void setUp() throws Exception {
+super.setUp();
+
+String url = HTTP_BASE_URL + /content/helloworld.html;
+try {
+getContent(url, CONTENT_TYPE_HTML, null);
+} catch (AssertionFailedError e) {
+// expected
+}
+}
+
public void testHelloWorldApp() throws IOException {
String url = HTTP_BASE_URL + /content/helloworld.html;
String content = getContent(url, CONTENT_TYPE_HTML);
svn commit: r1503745 - /sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: rombert Date: Tue Jul 16 15:06:06 2013 New Revision: 1503745 URL: http://svn.apache.org/r1503745 Log: SLING-1794 - ConfigInstallTest fails: Config must be removed once ConfigurationAdmin restarts: Configuration is still present Add timestamps to the IT log output to differentiate between test failures and timing issues. Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1503745r1=1503744r2=1503745view=diff == --- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Jul 16 15:06:06 2013 @@ -400,10 +400,16 @@ class OsgiInstallerTestBase implements F ), systemProperty( org.ops4j.pax.logging.DefaultServiceLog.level ).value(paxDebugLevel), provision( +mavenBundle(org.apache.sling, org.apache.sling.commons.log, 3.0.0), +mavenBundle(org.apache.sling, org.apache.sling.commons.logservice, 1.0.2), + +mavenBundle(org.slf4j, slf4j-api, 1.6.4), +mavenBundle(org.slf4j, jcl-over-slf4j, 1.6.4), +mavenBundle(org.slf4j, log4j-over-slf4j, 1.6.4), + mavenBundle(org.apache.felix, org.apache.felix.scr, 1.6.0), mavenBundle(org.apache.felix, org.apache.felix.configadmin, 1.2.8), mavenBundle(org.apache.felix, org.apache.felix.metatype, 1.0.2), - mavenBundle(org.apache.sling, org.apache.sling.commons.log, 2.1.2), mavenBundle(org.apache.sling, org.apache.sling.installer.core, POM_VERSION), mavenBundle(org.apache.sling, org.apache.sling.installer.factory.configuration, CONFIG_VERSION) )
svn commit: r1503746 - /sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: rombert Date: Tue Jul 16 15:06:17 2013 New Revision: 1503746 URL: http://svn.apache.org/r1503746 Log: SLING-1794 - ConfigInstallTest fails: Config must be removed once ConfigurationAdmin restarts: Configuration is still present Slightly increase the timeout when running tests, to help them pass consistently on Jenkins. Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1503746r1=1503745r2=1503746view=diff == --- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Jul 16 15:06:17 2013 @@ -70,7 +70,7 @@ class OsgiInstallerTestBase implements F protected OsgiInstaller installer; - public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 5000; +public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 6000; public static final String BUNDLE_BASE_NAME = org.apache.sling.installer.it- + POM_VERSION; @Inject
svn commit: r1503771 - in /sling/trunk/bundles/extensions/event: pom.xml src/test/java/org/apache/sling/event/it/ClassloadingTest.java src/test/java/org/apache/sling/event/it/Conditions.java
Author: rombert
Date: Tue Jul 16 15:59:57 2013
New Revision: 1503771
URL: http://svn.apache.org/r1503771
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently
Try to stabilize tests by using conditions and allowing for larger
timeouts.
Added:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/Conditions.java
(with props)
Modified:
sling/trunk/bundles/extensions/event/pom.xml
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Modified: sling/trunk/bundles/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1503771r1=1503770r2=1503771view=diff
==
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Jul 16 15:59:57 2013
@@ -266,6 +266,13 @@
scopetest/scope
/dependency
+dependency
+groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.testing.tools/artifactId
+version1.0.2/version
+scopetest/scope
+typebundle/type
+/dependency
dependency
groupIdorg.ops4j.pax.exam/groupId
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1503771r1=1503770r2=1503771view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Tue Jul 16 15:59:57 2013
@@ -39,8 +39,10 @@ import org.apache.sling.event.jobs.JobMa
import org.apache.sling.event.jobs.JobUtil;
import org.apache.sling.event.jobs.QueueConfiguration;
import org.apache.sling.event.jobs.consumer.JobConsumer;
+import org.apache.sling.testing.tools.retry.RetryLoop;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -53,6 +55,9 @@ import org.osgi.service.event.EventHandl
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class ClassloadingTest extends AbstractJobHandlingTest {
+private static final int CONDITION_INTERVAL_MILLIS = 50;
+private static final int CONDITION_TIMEOUT_SECONDS = 5;
+
private static final String QUEUE_NAME = cltest;
private static final String TOPIC = sling/cltest;
@@ -82,15 +87,15 @@ public class ClassloadingTest extends Ab
}
-@org.junit.Test public void testSimpleClassloading() throws Exception {
-final AtomicInteger count = new AtomicInteger(0);
+@Test
+public void testSimpleClassloading() throws Exception {
+final AtomicInteger processedJobsCount = new AtomicInteger(0);
final ListEvent finishedEvents = Collections.synchronizedList(new
ArrayListEvent());
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
new JobConsumer() {
-
@Override
public JobResult process(Job job) {
-count.incrementAndGet();
+processedJobsCount.incrementAndGet();
return JobResult.OK;
}
});
@@ -123,16 +128,25 @@ public class ClassloadingTest extends Ab
jobManager.addJob(TOPIC, null, props);
-while ( finishedEvents.size() 1 ) {
-// we wait a little bit
-Thread.sleep(100);
-}
-Thread.sleep(100);
+new
RetryLoop(Conditions.collectionIsNotEmptyCondition(finishedEvents,
+Waiting for finishedEvents to have at least one
element), 5, 50);
// no jobs queued, none processed and no available
-assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
-assertEquals(1, count.get());
-assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (MapString, Object[])null).size());
+new RetryLoop(new RetryLoop.Condition() {
+
+@Override
+public String getDescription() {
+return Waiting for job to be processed;
+}
+
+@Override
+public boolean isTrue() throws Exception {
+return jobManager.getStatistics().getNumberOfQueuedJobs()
== 0
+ processedJobsCount.get() == 0
+ jobManager.findJobs
svn commit: r1503779 - in /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it: AbstractJobHandlingTest.java ClassloadingTest.java
Author: rombert
Date: Tue Jul 16 16:15:24 2013
New Revision: 1503779
URL: http://svn.apache.org/r1503779
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently
- fix test logic which was changed inadvertently - spotted by @cziegler
- include the org.apache.sling.testing.tools bundle in the pax-exam
setup
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1503779r1=1503778r2=1503779view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Tue Jul 16 16:15:24 2013
@@ -137,6 +137,8 @@ public abstract class AbstractJobHandlin
mavenBundle(org.apache.derby, derby, 10.5.3.0_1),
mavenBundle(org.apache.sling,
org.apache.sling.jcr.jackrabbit.server, 2.1.1-SNAPSHOT),
+mavenBundle(org.apache.sling,
org.apache.sling.testing.tools, 1.0.6),
+
CoreOptions.bundle( bundleFile.toURI().toString() ),
junitBundles()
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1503779r1=1503778r2=1503779view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Tue Jul 16 16:15:24 2013
@@ -142,7 +142,7 @@ public class ClassloadingTest extends Ab
@Override
public boolean isTrue() throws Exception {
return jobManager.getStatistics().getNumberOfQueuedJobs()
== 0
- processedJobsCount.get() == 0
+ processedJobsCount.get() == 1
jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (MapString, Object[]) null)
.size() == 0;
}
svn commit: r1503793 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert Date: Tue Jul 16 16:47:40 2013 New Revision: 1503793 URL: http://svn.apache.org/r1503793 Log: SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails intermitently Fixed pax-exam setup for org.apache.sling.testing.tools Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1503793r1=1503792r2=1503793view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Tue Jul 16 16:47:40 2013 @@ -138,6 +138,8 @@ public abstract class AbstractJobHandlin mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.1-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), +mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2), +mavenBundle(org.apache.httpcomponents, httpclient-osgi, 4.1.2), CoreOptions.bundle( bundleFile.toURI().toString() ),
svn commit: r1503901 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Tue Jul 16 21:33:12 2013 New Revision: 1503901 URL: http://svn.apache.org/r1503901 Log: Launchpad: use latest snapshots I accidentally downgraded some versions in r1501298 . Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1503901r1=1503900r2=1503901view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jul 16 21:33:12 2013 @@ -141,7 +141,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.servlets.post/artifactId -version2.3.1-SNAPSHOT/version +version2.3.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -161,7 +161,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.classloader/artifactId -version3.1.13-SNAPSHOT/version +version3.2.1-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1504915 - /sling/whiteboard/asanso/plugins/eclipse/pom.xml
Author: rombert Date: Fri Jul 19 15:24:02 2013 New Revision: 1504915 URL: http://svn.apache.org/r1504915 Log: Update to Tycho 0.18.0 Modified: sling/whiteboard/asanso/plugins/eclipse/pom.xml Modified: sling/whiteboard/asanso/plugins/eclipse/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/pom.xml?rev=1504915r1=1504914r2=1504915view=diff == --- sling/whiteboard/asanso/plugins/eclipse/pom.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/pom.xml Fri Jul 19 15:24:02 2013 @@ -44,7 +44,7 @@ /build properties - tycho.version0.16.0/tycho.version + tycho.version0.18.0/tycho.version project.build.sourceEncodingUTF-8/project.build.sourceEncoding /properties /project
svn commit: r1504914 - in /sling/whiteboard/asanso/plugins/eclipse: api/src/org/apache/sling/slingclipse/api/ eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/ eclipse-ui/src/org/apache/sling/
Author: rombert Date: Fri Jul 19 15:17:03 2013 New Revision: 1504914 URL: http://svn.apache.org/r1504914 Log: SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure Removed empty directories Removed: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-p2update/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-target-definition/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/
svn commit: r1504892 - in /sling/whiteboard/asanso/plugins/eclipse: ./ slingclipse-feature/ slingclipse-target-definition/ slingclipse-wst/ slingclipse-wst/META-INF/ slingclipse-wst/icons/ slingclipse
Author: rombert Date: Fri Jul 19 15:02:12 2013 New Revision: 1504892 URL: http://svn.apache.org/r1504892 Log: SLING-2793 - [Tooling] Align Eclipse tooling to proposed structure WIP on getting a WST server definition Added: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/build.properties (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/icons/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/icons/obj16/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/icons/obj16/logo.png (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/icons/obj16/sling.gif (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/pom.xml (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java (with props) Modified: sling/whiteboard/asanso/plugins/eclipse/pom.xml sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/feature.xml sling/whiteboard/asanso/plugins/eclipse/slingclipse-target-definition/org.apache.sling.slingclipse.target-definition.target Modified: sling/whiteboard/asanso/plugins/eclipse/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/pom.xml?rev=1504892r1=1504891r2=1504892view=diff == --- sling/whiteboard/asanso/plugins/eclipse/pom.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/pom.xml Fri Jul 19 15:02:12 2013 @@ -13,6 +13,7 @@ moduleslingclipse-api/module moduleslingclipse-http/module moduleslingclipse-plugin/module + moduleslingclipse-wst/module moduleslingclipse-feature/module moduleslingclipse-p2update/module /modules Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/feature.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/feature.xml?rev=1504892r1=1504891r2=1504892view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/feature.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-feature/feature.xml Fri Jul 19 15:02:12 2013 @@ -33,4 +33,11 @@ version=0.0.0 unpack=false/ + plugin + id=org.apache.sling.slingclipse-wst + download-size=0 + install-size=0 + version=0.0.0 + unpack=false/ + /feature Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-target-definition/org.apache.sling.slingclipse.target-definition.target URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-target-definition/org.apache.sling.slingclipse.target-definition.target?rev=1504892r1=1504891r2=1504892view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-target-definition/org.apache.sling.slingclipse.target-definition.target (original) +++ sling/whiteboard
svn commit: r1504896 - /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Fri Jul 19 15:02:40 2013
New Revision: 1504896
URL: http://svn.apache.org/r1504896
Log:
SLING-2793 - [Tooling] Align Eclipse tooling to proposed structure
Implement proper resource sync which obeys all delta kinds. Still need
to make a proper implementation of SlingContentModuleDelegate.members
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java?rev=1504896r1=1504895r2=1504896view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Fri Jul 19 15:02:40 2013
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
import java.util.Arrays;
import org.apache.sling.slingclipse.SlingclipsePlugin;
+import org.apache.sling.slingclipse.api.Command;
import org.apache.sling.slingclipse.api.FileInfo;
import org.apache.sling.slingclipse.api.Repository;
import org.apache.sling.slingclipse.api.RepositoryInfo;
@@ -36,7 +37,10 @@ import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
public class SlingLaunchpadBehaviour extends ServerBehaviourDelegate {
@@ -132,6 +136,7 @@ public class SlingLaunchpadBehaviour ext
SlingLaunchpadConfiguration configuration =
launchpadServer.getConfiguration();
IModuleResource[] moduleResources = getResources(module);
+
Repository repository = SlingclipsePlugin.getDefault().getRepository();
try {
// TODO configurable scheme?
@@ -145,29 +150,94 @@ public class SlingLaunchpadBehaviour ext
// TODO handle error
}
-for (IModuleResource resource : moduleResources) {
-
-IFile file = (IFile) resource.getAdapter(IFile.class);
-
-IPath projectPath = file.getProject().getFullPath();
-IPath filePath = file.getFullPath();
-IPath relativePath = filePath.makeRelativeTo(projectPath);
-IPath rootPath = relativePath.removeLastSegments(1); // TODO
correct name
+switch (deltaKind) {
+case ServerBehaviourDelegate.CHANGED:
+IModuleResourceDelta[] publishedResourceDelta =
getPublishedResourceDelta(module);
+for (IModuleResourceDelta resourceDelta :
publishedResourceDelta) {
+if (resourceDelta.getModuleResource() instanceof
IModuleFile) {
+switch (resourceDelta.getKind()) {
+case IModuleResourceDelta.ADDED:
+case IModuleResourceDelta.CHANGED:
+case IModuleResourceDelta.NO_CHANGE: // TODO is
this needed?
+Result? result = addFileCommand(repository,
+(IModuleFile)
resourceDelta.getModuleResource()).execute();
+if (!result.isSuccess()) // TODO proper logging
+throw new CoreException(new
Status(Status.ERROR, some.plugin, result.toString()));
+break;
+case IModuleResourceDelta.REMOVED:
+Result? deleteResult =
removeFileCommand(repository,
+(IModuleFile)
resourceDelta.getModuleResource()).execute();
+if (!deleteResult.isSuccess()) // TODO proper
logging
+throw new CoreException(new
Status(Status.ERROR, some.plugin,
+deleteResult.toString()));
+break;
+}
+}
+}
+break;
-FileInfo info = new FileInfo(file.getLocation().toOSString(),
rootPath.toOSString(),
-file.getName());
+case ServerBehaviourDelegate.ADDED:
+case ServerBehaviourDelegate.NO_CHANGE: // TODO is this correct
svn commit: r1504902 - in /sling/whiteboard/asanso/plugins/eclipse: slingclipse-api/src/org/apache/sling/slingclipse/api/ slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/
Author: rombert
Date: Fri Jul 19 15:03:15 2013
New Revision: 1504902
URL: http://svn.apache.org/r1504902
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
When starting a server, wait for it to become available before setting
the state to 'STARTED'.
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java?rev=1504902r1=1504901r2=1504902view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
Fri Jul 19 15:03:15 2013
@@ -16,6 +16,8 @@
*/
package org.apache.sling.slingclipse.api;
+import java.net.URI;
+
public class RepositoryInfo {
private String username;
@@ -47,8 +49,8 @@ public class RepositoryInfo {
}
public int getPort(){
- String host=url.substring(7);
- return Integer.parseInt(host.split(:)[1]);
+
+return URI.create(url).getPort();
}
@Override
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java?rev=1504902r1=1504901r2=1504902view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Fri Jul 19 15:03:15 2013
@@ -25,6 +25,7 @@ import org.apache.sling.slingclipse.api.
import org.apache.sling.slingclipse.api.FileInfo;
import org.apache.sling.slingclipse.api.Repository;
import org.apache.sling.slingclipse.api.RepositoryInfo;
+import org.apache.sling.slingclipse.api.ResponseType;
import org.apache.sling.slingclipse.api.Result;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -32,6 +33,7 @@ import org.eclipse.core.resources.IResou
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.wst.server.core.IModule;
@@ -44,13 +46,30 @@ public class SlingLaunchpadBehaviour ext
@Override
public void stop(boolean force) {
-// TODO stub
+
setServerState(IServer.STATE_STOPPED);
}
-public void start() {
-// TODO stub
-setServerState(IServer.STATE_STARTED);
+public void start(IProgressMonitor monitor) throws CoreException {
+
+boolean success = false;
+
+ResultString result = null;
+CommandString command =
getRepository(monitor).newListChildrenNodeCommand(/, ResponseType.XML);
+result = command.execute();
+success = result.isSuccess();
+
+if (success) {
+setServerState(IServer.STATE_STARTED);
+} else {
+setServerState(IServer.STATE_STOPPED);
+String message = Unable to connect to Sling Lanchpad. Please make
sure a Launchpad instance is running ;
+if (result != null) {
+message += ( + result.toString() + );
+}
+throw new CoreException(new Status(IStatus.ERROR,
org.apache.sling.ide.eclipse.wst,
+message));
+}
}
// TODO refine signature, visibility
@@ -108,24 +127,10 @@ public class SlingLaunchpadBehaviour ext
System.out.println(trace.toString());
-SlingLaunchpadServer launchpadServer = (SlingLaunchpadServer)
getServer().loadAdapter(
-SlingLaunchpadServer.class, monitor);
-SlingLaunchpadConfiguration configuration =
launchpadServer.getConfiguration
svn commit: r1504895 - in /sling/whiteboard/asanso/plugins/eclipse: slingclipse-api/src/org/apache/sling/slingclipse/api/ slingclipse-plugin/META-INF/ slingclipse-wst/META-INF/ slingclipse-wst/src/org
Author: rombert
Date: Fri Jul 19 15:02:35 2013
New Revision: 1504895
URL: http://svn.apache.org/r1504895
Log:
SLING-2793 - [Tooling] Align Eclipse tooling to proposed structure
Implement very limited resource sync from the workspace to the
repository.
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/Repository.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/Repository.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/Repository.java?rev=1504895r1=1504894r2=1504895view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/Repository.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-api/src/org/apache/sling/slingclipse/api/Repository.java
Fri Jul 19 15:02:35 2013
@@ -78,6 +78,7 @@ public interface Repository {
public static String JCR_CHILD_VERSION_HISTORY=
jcr:childVersionHistory;
//TODO change with properties
+// FIXME this is not thread-safe and with multiple sling servers will fail
intermitently
public void setRepositoryInfo(RepositoryInfo repositoryInfo);
CommandVoid newAddNodeCommand(FileInfo fileInfo);
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF?rev=1504895r1=1504894r2=1504895view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF
Fri Jul 19 15:02:35 2013
@@ -18,3 +18,4 @@ Bundle-RequiredExecutionEnvironment: Jav
Bundle-ClassPath: .
Service-Component: OSGI-INF/component.xml
Import-Package: org.osgi.service.component;version=1.1.0
+Export-Package: org.apache.sling.slingclipse
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF?rev=1504895r1=1504894r2=1504895view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
Fri Jul 19 15:02:35 2013
@@ -5,7 +5,9 @@ Bundle-SymbolicName: org.apache.sling.sl
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
-Import-Package: org.eclipse.core.resources,
+Import-Package: org.apache.sling.slingclipse,
+ org.apache.sling.slingclipse.api,
+ org.eclipse.core.resources,
org.eclipse.core.runtime;version=3.4.0,
org.eclipse.core.runtime.jobs,
org.eclipse.debug.core,
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java?rev=1504895r1=1504894r2=1504895view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
Fri Jul 19 15:02:35 2013
@@ -1,8 +1,13 @@
package org.apache.sling.ide.eclipse.wst.internal;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -12,6 +17,7 @@ import org.eclipse.wst.common.project.fa
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IModuleResource;
import
svn commit: r1504893 - in /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst: ./ META-INF/ src/org/apache/sling/ide/eclipse/wst/internal/
Author: rombert Date: Fri Jul 19 15:02:22 2013 New Revision: 1504893 URL: http://svn.apache.org/r1504893 Log: SLING-2793 - [Tooling] Align Eclipse tooling to proposed structure WST server definition complete, now working on getting modules to deploy on the Sling server. Added: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java - copied, changed from r1504892, sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java - copied, changed from r1504892, sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF?rev=1504893r1=1504892r2=1504893view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF Fri Jul 19 15:02:22 2013 @@ -5,8 +5,18 @@ Bundle-SymbolicName: org.apache.sling.sl Bundle-Version: 0.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . -Import-Package: org.eclipse.core.runtime;version=3.4.0, +Import-Package: org.eclipse.core.resources, + org.eclipse.core.runtime;version=3.4.0, + org.eclipse.core.runtime.jobs, + org.eclipse.debug.core, + org.eclipse.debug.core.model, + org.eclipse.debug.ui, + org.eclipse.debug.ui.sourcelookup, + org.eclipse.jdt.debug.ui.launchConfigurations, + org.eclipse.jdt.launching, org.eclipse.jface.viewers, + org.eclipse.jst.common.project.facet.core, + org.eclipse.jst.server.core, org.eclipse.swt, org.eclipse.swt.events, org.eclipse.swt.layout, @@ -14,8 +24,8 @@ Import-Package: org.eclipse.core.runtime org.eclipse.ui, org.eclipse.ui.forms, org.eclipse.ui.forms.widgets, + org.eclipse.wst.common.project.facet.core, org.eclipse.wst.server.core, org.eclipse.wst.server.core.model, - org.eclipse.wst.server.ui.editor, - org.eclipse.core.resources, - org.eclipse.core.runtime.jobs + org.eclipse.wst.server.ui, + org.eclipse.wst.server.ui.editor Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml?rev=1504893r1=1504892r2=1504893view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml Fri Jul 19 15:02:22 2013 @@ -2,63 +2,167 @@ ?eclipse version=3.0? plugin - extension point=org.eclipse.wst.server.core.runtimeTypes + !-- Define the sling module type. TODO needed ? -- + extension point=org.eclipse.wst.server.core.moduleTypes +moduleType + id=sling.content + name=Sling module type/ + /extension + !-- Define the sling facet we support -- + extension point=org.eclipse.wst.common.project.facet.core.facets + project-facet id=sling.content + labelSling content module/label + descriptionSling content modules contain content which is installed into the repository as-is. Good examples are static files ( HTML, CSS, JS ), scripts ( JSP, ESP ) and any other form of content./description + /project-facet + + project-facet-version facet=sling.content
svn commit: r1504891 - /sling/whiteboard/asanso/plugins/eclipse/.gitignore
Author: rombert Date: Fri Jul 19 15:01:59 2013 New Revision: 1504891 URL: http://svn.apache.org/r1504891 Log: Added .gitignore This helps with git-svn usage. Added: sling/whiteboard/asanso/plugins/eclipse/.gitignore Added: sling/whiteboard/asanso/plugins/eclipse/.gitignore URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/.gitignore?rev=1504891view=auto == --- sling/whiteboard/asanso/plugins/eclipse/.gitignore (added) +++ sling/whiteboard/asanso/plugins/eclipse/.gitignore Fri Jul 19 15:01:59 2013 @@ -0,0 +1,4 @@ +.project +.settings +.classpath +target
svn commit: r1504900 - in /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal: SlingContentModuleFactory.java SlingLaunchpadBehaviour.java
Author: rombert
Date: Fri Jul 19 15:02:57 2013
New Revision: 1504900
URL: http://svn.apache.org/r1504900
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Allow creating directories individually additionally to files. There
seem to be some timing issues - at least with Eclipse 3.7.2 as directory
events are not fired immediately.
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java?rev=1504900r1=1504899r2=1504900view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
Fri Jul 19 15:02:57 2013
@@ -81,6 +81,8 @@ public class SlingContentModuleFactory e
IPath relativePath = resource.getProjectRelativePath();
+System.out.println(Visiting + resource + ...);
+
// only recurse in the expected content path
// TODO make configurable
if
(!SlingclipseHelper.JCR_ROOT.equals(relativePath.segment(0))) {
@@ -89,12 +91,19 @@ public class SlingContentModuleFactory e
IPath modulePath = relativePath.removeFirstSegments(1); //
remove jcr_root
+IModuleResource moduleFile = null;
+
if (resource.getType() == IResource.FILE) {
+moduleFile = new ModuleFile((IFile) resource,
resource.getName(), modulePath);
+} else if (resource.getType() == IResource.FOLDER) {
+moduleFile = new ModuleFolder((IFolder) resource,
resource.getName(), modulePath);
+}
-ModuleFile moduleFile = new ModuleFile((IFile)
resource, resource.getName(), modulePath);
+if (moduleFile != null)
resources.add(moduleFile);
-System.out.println(Converted + resource + to +
moduleFile);
-}
+
+System.out.println(Converted + resource + to +
moduleFile);
+
return true;
}
});
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java?rev=1504900r1=1504899r2=1504900view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Fri Jul 19 15:02:57 2013
@@ -16,7 +16,6 @@
*/
package org.apache.sling.ide.eclipse.wst.internal;
-import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@@ -28,6 +27,8 @@ import org.apache.sling.slingclipse.api.
import org.apache.sling.slingclipse.api.RepositoryInfo;
import org.apache.sling.slingclipse.api.Result;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -35,7 +36,6 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.IModuleFile;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
@@ -155,18 +155,15 @@ public class SlingLaunchpadBehaviour ext
System.out.println(deltaTrace);
-if (resourceDelta.getModuleResource() instanceof
IModuleFile) {
-
-switch (resourceDelta.getKind()) {
-case
svn commit: r1504906 - in /sling/whiteboard/asanso/plugins/eclipse: slingclipse-http/ slingclipse-http/META-INF/ slingclipse-http/OSGI-INF/ slingclipse-http/src/org/apache/sling/ide/impl/ slingclipse-
Author: rombert Date: Fri Jul 19 15:04:09 2013 New Revision: 1504906 URL: http://svn.apache.org/r1504906 Log: SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure Provide an internal tracing service for the http ( impl ) bundle. Added: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/.options sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/Tracer.xml (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/ide/impl/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/ide/impl/util/ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/ide/impl/util/Constants.java (with props) sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/ide/impl/util/Tracer.java - copied, changed from r1504905, sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/helper/Tracer.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/OSGI-INF/Tracer.xml (with props) Removed: sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/OSGI-INF/component.xml Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/META-INF/MANIFEST.MF sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/RepositoryImpl.xml sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/build.properties sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/META-INF/MANIFEST.MF sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/SlingclipsePlugin.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/helper/Tracer.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java Added: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/.options URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/.options?rev=1504906view=auto == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/.options (added) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/.options Fri Jul 19 15:04:09 2013 @@ -0,0 +1 @@ +org.apache.sling.slingclipse.http/debug=false \ No newline at end of file Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/META-INF/MANIFEST.MF?rev=1504906r1=1504905r2=1504906view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/META-INF/MANIFEST.MF (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/META-INF/MANIFEST.MF Fri Jul 19 15:04:09 2013 @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Service-Component: OSGI-INF/RepositoryImpl.xml, - OSGI-INF/SimpleXmlSerializationManager.xml + OSGI-INF/SimpleXmlSerializationManager.xml, OSGI-INF/Tracer.xml Import-Package: org.json Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/RepositoryImpl.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/RepositoryImpl.xml?rev=1504906r1=1504905r2=1504906view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/RepositoryImpl.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/RepositoryImpl.xml Fri Jul 19 15:04:09 2013 @@ -4,4 +4,5 @@ service provide interface=org.apache.sling.slingclipse.api.Repository/ /service + reference bind=bindTracer cardinality=1..1 interface=org.apache.sling.ide.impl.util.Tracer name=Tracer policy=static/ /scr:component Added: sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/Tracer.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/Tracer.xml?rev=1504906view=auto == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/Tracer.xml (added) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/OSGI-INF/Tracer.xml Fri Jul 19 15:04:09 2013 @@ -0,0
svn commit: r1504897 - /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
Author: rombert Date: Fri Jul 19 15:02:42 2013 New Revision: 1504897 URL: http://svn.apache.org/r1504897 Log: SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure Add an image for the sling.content plugin type. Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml?rev=1504897r1=1504896r2=1504897view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml Fri Jul 19 15:02:42 2013 @@ -141,6 +141,9 @@ image icon=icons/obj16/sling.gif typeIds=org.apache.sling.launchpad.server/ + image +icon=icons/obj16/sling.gif +typeIds=sling.content/ /extension !-- Define the editor section(s) we contribute to the WST UI --
svn commit: r1504904 - /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Fri Jul 19 15:03:33 2013
New Revision: 1504904
URL: http://svn.apache.org/r1504904
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Bring back update of .content.xml files as resource attributes.
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java?rev=1504904r1=1504903r2=1504904view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
Fri Jul 19 15:03:33 2013
@@ -16,17 +16,26 @@
*/
package org.apache.sling.ide.eclipse.wst.internal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import org.apache.sling.slingclipse.SlingclipsePlugin;
import org.apache.sling.slingclipse.api.Command;
import org.apache.sling.slingclipse.api.FileInfo;
+import org.apache.sling.slingclipse.api.ProtectedNodes;
import org.apache.sling.slingclipse.api.Repository;
import org.apache.sling.slingclipse.api.RepositoryInfo;
import org.apache.sling.slingclipse.api.ResponseType;
import org.apache.sling.slingclipse.api.Result;
+import org.apache.sling.slingclipse.helper.SlingclipseHelper;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
@@ -41,6 +50,9 @@ import org.eclipse.wst.server.core.IServ
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.json.JSONException;
+import org.json.JSONML;
+import org.json.JSONObject;
public class SlingLaunchpadBehaviour extends ServerBehaviourDelegate {
@@ -229,7 +241,7 @@ public class SlingLaunchpadBehaviour ext
throw new CoreException(new Status(Status.ERROR, some.plugin,
result.toString()));
}
-private Command? addFileCommand(Repository repository, IModuleResource
resource) {
+private Command? addFileCommand(Repository repository, IModuleResource
resource) throws CoreException {
FileInfo info = createFileInfo(resource);
@@ -238,7 +250,43 @@ public class SlingLaunchpadBehaviour ext
return null;
}
-return repository.newAddNodeCommand(info);
+if (SlingclipseHelper.CONTENT_XML.equals(info.getName())) {
+try {
+IFile file = (IFile) resource.getAdapter(IFile.class);
+InputStream contents = file.getContents();
+BufferedReader reader = new BufferedReader(new
InputStreamReader(contents));
+StringBuilder out = new StringBuilder();
+String line;
+while ((line = reader.readLine()) != null) {
+out.append(line);
+}
+MapString, String properties =
getModifiedProperties(out.toString());
+return repository.newUpdateContentNodeCommand(info,
properties);
+} catch (IOException e) {
+// TODO logging
+e.printStackTrace();
+return null;
+} catch (JSONException e) {
+// TODO logging
+e.printStackTrace();
+return null;
+}
+} else {
+return repository.newAddNodeCommand(info);
+}
+}
+
+private MapString, String getModifiedProperties(String fileContent)
throws JSONException {
+MapString, String properties = new HashMapString, String();
+JSONObject json = JSONML.toJSONObject(fileContent);
+json.remove(SlingclipseHelper.TAG_NAME);
+for (Iterator? keys = json.keys(); keys.hasNext();) {
+String key = (String) keys.next();
+if (!ProtectedNodes.exists(key) !key.contains(xmlns)) {
+properties.put(key, json.optString(key));
+}
+}
+return properties;
}
private FileInfo createFileInfo(IModuleResource resource) {
@@ -259,6 +307,10 @@ public class SlingLaunchpadBehaviour ext
String relativePath = rootPath.toOSString();
+if (file.getName().equals
svn commit: r1504901 - in /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst: META-INF/ src/org/apache/sling/ide/eclipse/wst/internal/ src/org/apache/sling/ide/eclipse/wst/ui/internal/
Author: rombert
Date: Fri Jul 19 15:03:07 2013
New Revision: 1504901
URL: http://svn.apache.org/r1504901
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Persist configuration changes made to the server.
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
(with props)
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF?rev=1504901r1=1504900r2=1504901view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
Fri Jul 19 15:03:07 2013
@@ -8,6 +8,8 @@ Bundle-ClassPath: .
Import-Package: org.apache.sling.slingclipse,
org.apache.sling.slingclipse.api,
org.apache.sling.slingclipse.helper,
+ org.eclipse.core.commands,
+ org.eclipse.core.commands.operations,
org.eclipse.core.resources,
org.eclipse.core.runtime;version=3.4.0,
org.eclipse.core.runtime.jobs,
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java?rev=1504901view=auto
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
(added)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
Fri Jul 19 15:03:07 2013
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.wst.internal;
+
+import
org.apache.sling.ide.eclipse.wst.ui.internal.SetServerStringPropertyCommand;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+
+public class SetServerContextPathCommand extends
SetServerStringPropertyCommand {
+
+public SetServerContextPathCommand(IServerWorkingCopy server, String
newValue) {
+super(server, SlingLaunchpadServer.PROP_CONTEXT_PATH, newValue, /);
+}
+
+}
Propchange:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
--
svn:keywords = Author Date Id Revision Rev URL
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org
svn commit: r1504903 - in /sling/whiteboard/asanso/plugins/eclipse: slingclipse-http/src/org/apache/sling/slingclipse/http/impl/ slingclipse-plugin/ slingclipse-plugin/src/org/apache/sling/slingclipse
Author: rombert
Date: Fri Jul 19 15:03:29 2013
New Revision: 1504903
URL: http://svn.apache.org/r1504903
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Make the import action based on the Sling facet rather than the nature.
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
(contents, props changed)
- copied, changed from r1504902,
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/ui/wizards/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizardPage.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SelectionUtils.java
(with props)
Removed:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/ui/wizards/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/ui/wizards/ImportWizardPage.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java?rev=1504903r1=1504902r2=1504903view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
Fri Jul 19 15:03:29 2013
@@ -18,6 +18,7 @@ package org.apache.sling.slingclipse.htt
import java.io.File;
import java.util.Map;
+
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -46,7 +47,7 @@ public class RepositoryImpl extends Abst
return new CommandVoid() {
@Override
public ResultVoid execute() {
- PostMethod post = new
PostMethod(repositoryInfo.getUrl()+fileInfo.getRelativeLocation());
+PostMethod post = new
PostMethod(createFullPath(fileInfo.getRelativeLocation()));
try{
File f=new File(fileInfo.getLocation());
if (f.isFile()) {
@@ -97,7 +98,8 @@ public class RepositoryImpl extends Abst
return new CommandVoid() {
@Override
public ResultVoid execute() {
- PostMethod post = new
PostMethod(repositoryInfo.getUrl()+fileInfo.getRelativeLocation()+/+fileInfo.getName());
+PostMethod post = new
PostMethod(createFullPath(fileInfo.getRelativeLocation() + /
++ fileInfo.getName()));
try{
Part[] parts ={new
StringPart(:operation, delete)};
post.setRequestEntity(new
MultipartRequestEntity(parts,post.getParams()));
@@ -126,7 +128,7 @@ public class RepositoryImpl extends Abst
@Override
public ResultString execute() {
//TODO handle the response type
- GetMethod get= new
GetMethod(repositoryInfo.getUrl()+path+.1.json);
+GetMethod get = new GetMethod(createFullPath(path +
.1.json));
try{
httpClient.getParams().setAuthenticationPreemptive(true);
Credentials defaultcreds = new
UsernamePasswordCredentials(repositoryInfo.getUsername(),
repositoryInfo.getPassword());
@@ -162,7 +164,7 @@ public class RepositoryImpl extends Abst
@Override
svn commit: r1504894 - in /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst: META-INF/MANIFEST.MF plugin.xml src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
Author: rombert
Date: Fri Jul 19 15:02:28 2013
New Revision: 1504894
URL: http://svn.apache.org/r1504894
Log:
SLING-2793 - [Tooling] Align Eclipse tooling to proposed structure
Make it possible to deploy a content plugin on a Sling Launchpad.
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
(with props)
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF?rev=1504894r1=1504893r2=1504894view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
Fri Jul 19 15:02:28 2013
@@ -27,5 +27,6 @@ Import-Package: org.eclipse.core.resourc
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.server.core,
org.eclipse.wst.server.core.model,
+ org.eclipse.wst.server.core.util,
org.eclipse.wst.server.ui,
org.eclipse.wst.server.ui.editor
Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml?rev=1504894r1=1504893r2=1504894view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml Fri Jul
19 15:02:28 2013
@@ -9,6 +9,18 @@
name=Sling module type/
/extension
+ !-- Define a sling module factory --
+ extension point=org.eclipse.wst.server.core.moduleFactories
+ moduleFactory
+ projects=true
+
class=org.apache.sling.ide.eclipse.wst.internal.SlingContentModuleFactory
+ id=org.apache.sling.contentModuleFactory
+ moduleType
+ versions=1.0
+ types=sling.content/
+ /moduleFactory
+ /extension
+
!-- Define the sling facet we support --
extension point=org.eclipse.wst.common.project.facet.core.facets
project-facet id=sling.content
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java?rev=1504894view=auto
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
(added)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
Fri Jul 19 15:02:28 2013
@@ -0,0 +1,64 @@
+package org.apache.sling.ide.eclipse.wst.internal;
+
+import java.util.Iterator;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
+
+public class SlingContentModuleFactory extends ProjectModuleFactoryDelegate {
+
+private static final String NATURE_ID = sling.content;
+
+@Override
+public ModuleDelegate getModuleDelegate(IModule arg0) {
+
+System.out.println(SlingContentModuleFactory.getModuleDelegate());
+
+return new SlingContentModuleDelegate();
+}
+
+@Override
+protected IModule createModule(IProject project) {
+
+try {
+IFacetedProject facetedProject =
ProjectFacetsManager.create(project);
+for (IProjectFacetVersion facet :
facetedProject.getProjectFacets()) {
+System.out.println(Project + project + has facet +
facet);
+if (facet.getProjectFacet().getId().equals(NATURE_ID)) {
+return createModule(project.getName(), project.getName(),
NATURE_ID, 1.0, project);
+}
+}
+} catch (CoreException ce) {
+// TODO logging
+}
+
+
+return null;
+}
+
+static
svn commit: r1504908 [2/2] - in /sling/whiteboard/asanso/plugins/eclipse: ./ api/ api/META-INF/ api/src/ api/src/org/ api/src/org/apache/ api/src/org/apache/sling/ api/src/org/apache/sling/ide/ api/sr
Copied:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
(from r1504907,
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.javap1=sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.javar1=1504907r2=1504908rev=1504908view=diff
==
(empty)
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
--
svn:keywords = Author Date Id Revision Rev URL
Copied:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
(from r1504907,
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.javap1=sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.javar1=1504907r2=1504908rev=1504908view=diff
==
(empty)
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
--
svn:keywords = Author Date Id Revision Rev URL
Copied:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
(from r1504907,
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.javap1=sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.javar1=1504907r2=1504908rev=1504908view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
Fri Jul 19 15:05:56 2013
@@ -92,14 +92,16 @@ public class SlingProjectPropertyPage ex
private String getValueWithDefault() {
-// TODO central place for defaults
-String value = jcr_root;
+String value = null;
try {
value = getProject().getPersistentProperty(new
QualifiedName(Constants.PLUGIN_ID, PROPERTY_SYNC_ROOT));
} catch (CoreException e) {
// TODO error handling
}
+// TODO central place for defaults
+if (value == null)
+value = jcr_root;
return value;
}
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
--
svn commit: r1504910 [2/2] - in /sling/whiteboard/asanso/plugins/eclipse: api/META-INF/ api/src/org/apache/sling/ide/transport/ api/src/org/apache/sling/slingclipse/api/ eclipse-core/ eclipse-core/MET
Copied:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
(from r1504909,
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.javap1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.javar1=1504909r2=1504910rev=1504910view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.ui.internal;
+package org.apache.sling.ide.eclipse.ui.internal;
import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
@@ -23,13 +23,11 @@ import java.util.Iterator;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.serialization.SerializationManager;
-import org.apache.sling.slingclipse.SlingclipsePlugin;
-import org.apache.sling.slingclipse.api.Command;
-import org.apache.sling.slingclipse.api.Repository;
-import org.apache.sling.slingclipse.api.RepositoryException;
-import org.apache.sling.slingclipse.api.ResponseType;
-import org.apache.sling.slingclipse.api.Result;
-import org.apache.sling.slingclipse.helper.Tracer;
+import org.apache.sling.ide.transport.Command;
+import org.apache.sling.ide.transport.Repository;
+import org.apache.sling.ide.transport.RepositoryException;
+import org.apache.sling.ide.transport.ResponseType;
+import org.apache.sling.ide.transport.Result;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -62,7 +60,7 @@ public class ImportWizard extends Wizard
*/
public ImportWizard() {
super();
-serializationManager =
SlingclipsePlugin.getDefault().getSerializationManager();
+serializationManager =
Activator.getDefault().getSerializationManager();
}
/*
@@ -88,8 +86,6 @@ public class ImportWizard extends Wizard
Repository repository = ServerUtil.getRepository(server,
monitor);
- Tracer tracer =
SlingclipsePlugin.getDefault().getTracer();
-
monitor.setTaskName(Loading
configuration...);
monitor.worked(5);
ISlingLaunchpadServer launchpad = (ISlingLaunchpadServer)
server.loadAdapter(
@@ -112,13 +108,13 @@ public class ImportWizard extends Wizard
// we create the root node and assume this is a folder
createRoot(project, projectRelativePath,
repositoryPath);
-
crawlChildrenAndImport(repository, repositoryPath, project,
projectRelativePath, tracer);
+crawlChildrenAndImport(repository, repositoryPath,
project, projectRelativePath);
monitor.setTaskName(Import
Complete);
monitor.worked(100);
} catch ( Exception e) {
- Status status = new
Status(Status.ERROR, SlingclipsePlugin.PLUGIN_ID, Failed importing repository
, e);
-
SlingclipsePlugin.getDefault().getLog().log(status);
+ Status status = new
Status(Status.ERROR, Activator.PLUGIN_ID, Failed importing repository , e);
+
Activator.getDefault().getLog().log(status);
return status;
}finally{
if (oldPublishState !=
ISlingLaunchpadServer.PUBLISH_STATE_NEVER) {
@@ -183,24 +179,25 @@ public class ImportWizard extends Wizard
* @throws CoreException
*/
// TODO: This probably should be pushed into the service layer
- private void crawlChildrenAndImport(Repository repository,String
path,IProject project, IPath projectRelativePath, Tracer tracer) throws
svn commit: r1504911 - in /sling/whiteboard/asanso/plugins/eclipse: eclipse-core/plugin.xml eclipse-ui/plugin.xml eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurat
Author: rombert Date: Fri Jul 19 15:07:21 2013 New Revision: 1504911 URL: http://svn.apache.org/r1504911 Log: SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure Update ids in the plugin.xml files to be more consistent with the component types they define and also to be under the org.apache.sling.ide namespace. Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml?rev=1504911r1=1504910r2=1504911view=diff == --- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml (original) +++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml Fri Jul 19 15:07:21 2013 @@ -2,7 +2,7 @@ ?eclipse version=3.0? plugin - !-- Define the sling module type. TODO needed ? -- + !-- Define the sling module type -- extension point=org.eclipse.wst.server.core.moduleTypes moduleType id=sling.content @@ -14,7 +14,7 @@ moduleFactory projects=true class=org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory - id=org.apache.sling.contentModuleFactory + id=org.apache.sling.ide.contentModuleFactory moduleType versions=1.0 types=sling.content/ @@ -29,7 +29,6 @@ /project-facet project-facet-version facet=sling.content version=1.0/ - !-- TODO add image -- action facet=sling.content version=1.0 type=INSTALL delegate class=org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate/ @@ -43,7 +42,7 @@ !-- Define the Sling launchpad runtime type -- extension point=org.eclipse.wst.server.core.runtimeTypes runtimeType - id=org.apache.sling.launchpad.runtime + id=org.apache.sling.ide.launchpadRuntimeType name=Sling Launchpad (runtime name) description=Sling Launchpad (runtime description) vendor=Sling @@ -56,7 +55,7 @@ !-- Define the Sling launchpad server type -- extension point=org.eclipse.wst.server.core.serverTypes serverType - id=org.apache.sling.launchpad.server + id=org.apache.sling.ide.launchpadServer name=Sling Launchpad (server name) description=Sling Launchpad (server description) supportsRemoteHosts=true @@ -65,8 +64,8 @@ stopTimeout=15000 initialState=stopped hasConfiguration=true - launchConfigId=org.apache.sling.ide.eclipse.launchpad.launchConfigurationType - runtimeTypeId=org.apache.sling.launchpad.runtime + launchConfigId=org.apache.sling.ide.launchpadLaunchConfigurationType + runtimeTypeId=org.apache.sling.ide.launchpadRuntimeType class=org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadServer behaviourClass=org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadBehaviour /serverType @@ -75,13 +74,13 @@ extension point=org.eclipse.wst.server.core.launchableAdapters launchableAdapter class=org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchableAdapterDelegate -id=org.sling.slingclipse.web/ +id=org.apache.sling.ide.launchpadLaunchableAdapterDelegate/ /extension !-- Define the launch configuration type for the launchpad TODO do we need a sourcePathComputer ? -- extension point=org.eclipse.debug.core.launchConfigurationTypes launchConfigurationType -id=org.apache.sling.ide.eclipse.launchpad.launchConfigurationType +id=org.apache.sling.ide.launchpadLaunchConfigurationType name=Sling Launchpad delegate=org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate modes=run @@ -90,12 +89,12 @@ !-- Declare that the launchpad runtime type, supporting content modules -- extension point=org.eclipse.wst.common.project.facet.core.runtimes - runtime-component-type id=org.apache.sling.launchpad/ - runtime-component-version type=org.apache.sling.launchpad version=1.0/ + runtime-component-type id=org.apache.sling.ide.launchpadRuntimeComponentType/ + runtime-component-version type=org.apache.sling.ide.launchpadRuntimeComponentType version=1.0/ adapter runtime-component -id=org.apache.sling.launchpad/ +id=org.apache.sling.ide.launchpadRuntimeComponentType
svn commit: r1504907 - in /sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst: ./ META-INF/ src/org/apache/sling/ide/eclipse/wst/ui/internal/
Author: rombert
Date: Fri Jul 19 15:04:17 2013
New Revision: 1504907
URL: http://svn.apache.org/r1504907
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Add a project property page for setting the directory to sync. Not yet
hooked up to the actualy sync process.
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
(with props)
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF?rev=1504907r1=1504906r2=1504907view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/META-INF/MANIFEST.MF
Fri Jul 19 15:04:17 2013
@@ -22,6 +22,7 @@ Import-Package: org.apache.sling.ide.ser
org.eclipse.jdt.launching,
org.eclipse.jface.action,
org.eclipse.jface.dialogs,
+ org.eclipse.jface.preference,
org.eclipse.jface.viewers,
org.eclipse.jface.window,
org.eclipse.jface.wizard,
Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml?rev=1504907r1=1504906r2=1504907view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/plugin.xml Fri Jul
19 15:04:17 2013
@@ -201,6 +201,25 @@
/enablement
/objectContribution
/extension
+
+ !-- Property page for project to select directory to sync --
+ extension point=org.eclipse.ui.propertyPages
+page
+id=org.apache.sling.ide.eclipse.projectPropertyPage
+name=Sling
+
class=org.apache.sling.ide.eclipse.wst.ui.internal.SlingProjectPropertyPage
+enabledWhen
+and
+ instanceof
+ value=org.eclipse.core.resources.IProject
+ /instanceof
+ test
+
property=org.eclipse.wst.common.project.facet.core.projectFacet
+ value=sling.content/
+ /and
+ /enabledWhen
+/page
+/extension
!--
extension point=org.eclipse.debug.ui.launchConfigurationTypeImages
Added:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java?rev=1504907view=auto
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
(added)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
Fri Jul 19 15:04:17 2013
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.eclipse.wst.ui.internal;
+
+public abstract class Constants {
+
+public static final String PLUGIN_ID = org.apache.sling.ide.eclipse.wst;
+
+private Constants() {
+
+}
+}
Propchange:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-wst/src/org/apache/sling/ide/eclipse/wst/ui
svn commit: r1505032 - in /sling/whiteboard/asanso/plugins/eclipse/eclipse-ui: META-INF/ src/org/apache/sling/ide/eclipse/ui/internal/
Author: rombert
Date: Fri Jul 19 21:40:42 2013
New Revision: 1505032
URL: http://svn.apache.org/r1505032
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Re-apply changes from r1415704.
Added:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
(with props)
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/sling-logo.png
(with props)
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF?rev=1505032r1=1505031r2=1505032view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF Fri
Jul 19 21:40:42 2013
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Slingclipse-WST-plugin
Bundle-SymbolicName: org.apache.sling.ide.eclipse-ui;singleton:=true
+Bundle-Activator: org.apache.sling.ide.eclipse.ui.internal.Activator
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
@@ -21,7 +22,9 @@ Import-Package: org.apache.sling.ide.ecl
org.eclipse.jdt.launching,
org.eclipse.jface.action,
org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
org.eclipse.jface.preference,
+ org.eclipse.jface.resource,
org.eclipse.jface.viewers,
org.eclipse.jface.window,
org.eclipse.jface.wizard,
@@ -43,3 +46,4 @@ Import-Package: org.apache.sling.ide.ecl
org.eclipse.wst.server.ui.editor,
org.json,
org.osgi.framework
+Bundle-ActivationPolicy: lazy
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1505032r1=1505031r2=1505032view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
Fri Jul 19 21:40:42 2013
@@ -38,8 +38,6 @@ public class Activator extends Plugin {
public void start(BundleContext context) throws Exception {
super.start(context);
-System.out.println(Starting with context + context);
-
serializationManagerRef =
context.getServiceReference(SerializationManager.class);
serializationManager = context.getService(serializationManagerRef);
@@ -52,8 +50,6 @@ public class Activator extends Plugin {
context.ungetService(serializationManagerRef);
-System.out.println(Stopping with context + context);
-
super.stop(context);
}
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1505032r1=1505031r2=1505032view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
Fri Jul 19 21:40:42 2013
@@ -17,6 +17,7 @@
package org.apache.sling.ide.eclipse.ui.internal;
import java.io.ByteArrayInputStream;
+import java.lang.reflect.InvocationTargetException;
import java.nio.charset.Charset;
import java.util.Iterator;
@@ -35,9 +36,8 @@ import org.eclipse.core.resources.Resour
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IImportWizard;
@@ -60,7 +60,8 @@ public class ImportWizard extends
svn commit: r1505031 - /sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
Author: rombert
Date: Fri Jul 19 21:40:35 2013
New Revision: 1505031
URL: http://svn.apache.org/r1505031
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Add missing Bundle-Activator for eclipse-ui.
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1505031r1=1505030r2=1505031view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
Fri Jul 19 21:40:35 2013
@@ -38,6 +38,8 @@ public class Activator extends Plugin {
public void start(BundleContext context) throws Exception {
super.start(context);
+System.out.println(Starting with context + context);
+
serializationManagerRef =
context.getServiceReference(SerializationManager.class);
serializationManager = context.getService(serializationManagerRef);
@@ -50,6 +52,8 @@ public class Activator extends Plugin {
context.ungetService(serializationManagerRef);
+System.out.println(Stopping with context + context);
+
super.stop(context);
}
svn commit: r1504890 - /sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java
Author: rombert Date: Fri Jul 19 15:00:46 2013 New Revision: 1504890 URL: http://svn.apache.org/r1504890 Log: Correct copyright on SlingProjectBuilder Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java Modified: sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java?rev=1504890r1=1504889r2=1504890view=diff == --- sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java (original) +++ sling/whiteboard/asanso/plugins/eclipse/slingclipse-plugin/src/org/apache/sling/slingclipse/internal/SlingProjectBuilder.java Fri Jul 19 15:00:46 2013 @@ -1,20 +1,19 @@ -/* +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * ADOBE CONFIDENTIAL - * __ + * http://www.apache.org/licenses/LICENSE-2.0 * - * Copyright 2012 Adobe Systems Incorporated - * All Rights Reserved. - * - * NOTICE: All information contained herein is, and remains - * the property of Adobe Systems Incorporated and its suppliers, - * if any. The intellectual and technical concepts contained - * herein are proprietary to Adobe Systems Incorporated and its - * suppliers and are protected by trade secret or copyright law. - * Dissemination of this information or reproduction of this material - * is strictly forbidden unless prior written permission is obtained - * from Adobe Systems Incorporated. - **/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.sling.slingclipse.internal; import java.util.Map;
svn commit: r1504899 - /sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
Author: rombert
Date: Fri Jul 19 15:02:53 2013
New Revision: 1504899
URL: http://svn.apache.org/r1504899
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Allow creating directory nodes as well with the newAddNodeCommand
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java?rev=1504899r1=1504898r2=1504899view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/slingclipse-http/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
Fri Jul 19 15:02:53 2013
@@ -49,8 +49,10 @@ public class RepositoryImpl extends Abst
PostMethod post = new
PostMethod(repositoryInfo.getUrl()+fileInfo.getRelativeLocation());
try{
File f=new File(fileInfo.getLocation());
- Part[] parts ={ new
FilePart(fileInfo.getName(), f)};
- post.setRequestEntity(new
MultipartRequestEntity(parts,post.getParams()));
+if (f.isFile()) {
+Part[] parts = { new FilePart(fileInfo.getName(), f) };
+post.setRequestEntity(new
MultipartRequestEntity(parts, post.getParams()));
+}
httpClient.getState().setCredentials(AuthScope.ANY, new
UsernamePasswordCredentials(repositoryInfo.getUsername(),repositoryInfo.getPassword()));
httpClient.getParams().setAuthenticationPreemptive(true);
int
responseStatus=httpClient.executeMethod(post);
svn commit: r1505618 - /sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java
Author: rombert
Date: Mon Jul 22 08:06:30 2013
New Revision: 1505618
URL: http://svn.apache.org/r1505618
Log:
SLING-2929 - Wasted work in ClassDescriptor.validate()
Optimize ClassDescriptor.validate() - applied patch ffrom Adrian Nistor.
Modified:
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java
Modified:
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java?rev=1505618r1=1505617r2=1505618view=diff
==
---
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java
(original)
+++
sling/trunk/maven/maven-jcrocm-plugin/src/main/java/org/apache/sling/maven/jcrocm/ClassDescriptor.java
Mon Jul 22 08:06:30 2013
@@ -244,6 +244,7 @@ public class ClassDescriptor extends Abs
for (Iterator ci = children.iterator(); ci.hasNext();) {
AbstractDescriptorElement child =
(AbstractDescriptorElement) ci.next();
valid = child.validate();
+if (!valid) break;
}
}
}
svn commit: r1505793 - in /sling/trunk/contrib/launchpad/karaf: ./ org.apache.sling.launchpad.karaf-features/ org.apache.sling.launchpad.karaf-features/src/main/feature/ org.apache.sling.launchpad.kar
Author: rombert Date: Mon Jul 22 20:18:44 2013 New Revision: 1505793 URL: http://svn.apache.org/r1505793 Log: SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails Applied SLING-2789.2013-07-17.patch from Oliver Lietz: * corrected various documentation and legal files * use a released version of the karaf-maven-plugin * resync the karaf feature list with the launchpad * remove unneeded dependency on org.apache.karaf.tooling.exam.options Modified: sling/trunk/contrib/launchpad/karaf/NOTICE sling/trunk/contrib/launchpad/karaf/README.txt sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml Modified: sling/trunk/contrib/launchpad/karaf/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/NOTICE?rev=1505793r1=1505792r2=1505793view=diff == --- sling/trunk/contrib/launchpad/karaf/NOTICE (original) +++ sling/trunk/contrib/launchpad/karaf/NOTICE Mon Jul 22 20:18:44 2013 @@ -1,9 +1,8 @@ -Apache Sling Launchpad ServiceMix Kernel -Copyright 2008-2009 The Apache Software Foundation - -Apache Sling is based on source code originally developed -by Day Software (http://www.day.com/). - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - \ No newline at end of file +Apache Sling Launchpad Karaf +Copyright 2008-2013 The Apache Software Foundation + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Modified: sling/trunk/contrib/launchpad/karaf/README.txt URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/README.txt?rev=1505793r1=1505792r2=1505793view=diff == --- sling/trunk/contrib/launchpad/karaf/README.txt (original) +++ sling/trunk/contrib/launchpad/karaf/README.txt Mon Jul 22 20:18:44 2013 @@ -1,10 +1,10 @@ Apache Sling Launchpad Karaf -Builds a repository of features that allows an easy deployment of Apache Sling -on Apache Felix Karaf [1]. See [2] for details. +A repository of features and a startup handler that allow an easy deployment +of Apache Sling on Apache Karaf [1]. See [2] for details. -[1] http://felix.apache.org/site/apache-felix-karaf.html -[2] http://felix.apache.org/site/46-provisioning.html +[1] http://karaf.apache.org +[2] http://karaf.apache.org/manual/latest/users-guide/provisioning.html Getting Started === @@ -13,15 +13,15 @@ This component uses a Maven 2 (http://ma environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/) 2.0.7 or later. We recommend to use the latest Maven version. -If you have Maven 2 installed, you can install locally -the features repository using the following command: +If you have Maven 2 installed, you can install locally the features repository +and startup handler using the following command: mvn clean install See the Maven 2 documentation for other build features. The latest source code for this component is available in the -Subversion (http://subversion.tigris.org/) source repository of +Subversion (http://subversion.apache.org/) source repository of the Apache Software Foundation. If you have Subversion installed, you can checkout the latest source using the following command: @@ -33,28 +33,19 @@ See the Subversion documentation for oth How to deploy this --- -1) Install Apache Felix Karaf. See details in: +1) Start Apache Karaf. See details in: - http://felix.apache.org/site/3-installation.html + http://karaf.apache.org/manual/latest/quick-start.html -2) Deploy your favourite JTA bundle specification. Apache Karaf recommends - geronimo-jta_1.1_spec-1.1.1. From smx console: - - karaf@root:/ osgi:install mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 +2) Add the Apache Sling features repository and install: - Start the bundle just installed: + karaf@root() feature:repo-add mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0.BUILD-SNAPSHOT/xml/features + karaf@root() feature:install sling-karaf - karaf@root:/ osgi:start bundle-pid - -3) Install the http feature in order to get an HTTP OSGi service available: - - karaf@root:/ features:install http +3) Install Launchpad content and Explorer
svn commit: r1505811 - in /sling/whiteboard/asanso/plugins/eclipse: api/META-INF/ api/src/org/apache/sling/ide/util/ eclipse-ui/META-INF/ eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ impl-
Author: rombert
Date: Mon Jul 22 20:57:28 2013
New Revision: 1505811
URL: http://svn.apache.org/r1505811
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
The ImportWizard now uses filters when importing content.
Added:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
(with props)
Modified:
sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Modified: sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF?rev=1505811r1=1505810r2=1505811view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF Mon Jul 22
20:57:28 2013
@@ -7,6 +7,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.apache.sling.ide.serialization,
+Export-Package: org.apache.sling.ide.filter,
+ org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
- org.apache.sling.ide.filter
+ org.apache.sling.ide.util
Added:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java?rev=1505811view=auto
==
---
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
(added)
+++
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
Mon Jul 22 20:57:28 2013
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.util;
+
+public class PathUtil {
+
+public static String join(String first, String second) {
+
+boolean repoUrlHasTrailingSlash = first.endsWith(/);
+boolean relativePathHasLeadingSlash = !second.isEmpty()
second.charAt(0) == '/';
+
+if (repoUrlHasTrailingSlash ^ relativePathHasLeadingSlash)
+return first + second;
+if (!repoUrlHasTrailingSlash !relativePathHasLeadingSlash)
+return first + '/' + second;
+if (repoUrlHasTrailingSlash relativePathHasLeadingSlash)
+return first + second.substring(1);
+
+throw new AssertionError(unreachable);
+}
+}
Propchange:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
--
svn:eol-style = native
Propchange:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/util/PathUtil.java
--
svn:keywords = Author Date Id Revision Rev URL
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF?rev=1505811r1=1505810r2=1505811view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF Mon
Jul 22 20:57:28 2013
@@ -7,8 +7,10 @@ Bundle-Version: 0.0.1.qualifier
Bundle
svn commit: r1505810 - in /sling/whiteboard/asanso/plugins/eclipse: eclipse-core/ eclipse-core/OSGI-INF/ eclipse-core/src/org/apache/sling/ide/eclipse/core/ eclipse-core/src/org/apache/sling/ide/eclip
Author: rombert
Date: Mon Jul 22 20:57:13 2013
New Revision: 1505810
URL: http://svn.apache.org/r1505810
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Fixed tracing and also improved usage of OSGi services.
Added:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
- copied, changed from r1505809,
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/.options
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options?rev=1505810r1=1505809r2=1505810view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/.options Mon Jul 22
20:57:13 2013
@@ -1 +1 @@
-org.apache.sling.slingclipse/debug=false
\ No newline at end of file
+org.apache.sling.ide.eclipse-core/debug=false
\ No newline at end of file
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml?rev=1505810r1=1505809r2=1505810view=diff
==
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
(original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
Mon Jul 22 20:57:13 2013
@@ -4,5 +4,6 @@
property name=listener.symbolic.name type=String
value=org.apache.sling.ide.eclipse-core/
service
provide interface=org.apache.sling.ide.eclipse.core.internal.Tracer/
+ provide
interface=org.eclipse.osgi.service.debug.DebugOptionsListener/
/service
/scr:component
Copied:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
(from r1505809,
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.javap1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.javar1=1505809r2=1505810rev=1505810view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServiceUtil.java
Mon Jul 22 20:57:13 2013
@@ -14,9 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.impl.resource.util;
+package org.apache.sling.ide.eclipse.core;
-public class Constants {
+import org.osgi.util.tracker.ServiceTracker;
-public static final String PLUGIN_ID = org.apache.sling.slingclipse.http;
+public class ServiceUtil {
+
+public static S, T T getNotNull(ServiceTrackerS, T serviceTracker) {
+T service = serviceTracker.getService();
+if (service == null)
+throw new IllegalStateException
svn commit: r1505812 - /sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
Author: rombert
Date: Mon Jul 22 20:57:35 2013
New Revision: 1505812
URL: http://svn.apache.org/r1505812
Log:
Correct copyright on ImportContentAction
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java?rev=1505812r1=1505811r2=1505812view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
Mon Jul 22 20:57:35 2013
@@ -1,20 +1,19 @@
-/*
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * ADOBE CONFIDENTIAL
- * __
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Copyright 2013 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any. The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- **/
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.sling.ide.eclipse.ui.internal;
import java.util.Iterator;
@@ -33,10 +32,6 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerUtil;
-/**
- * The ttImportContentAction/tt TODO
- *
- */
public class ImportContentAction implements IObjectActionDelegate,
IExecutableExtension {
private ISelection selection;
svn commit: r1505921 - /sling/trunk/contrib/launchpad/karaf/src/
Author: rombert Date: Tue Jul 23 07:19:51 2013 New Revision: 1505921 URL: http://svn.apache.org/r1505921 Log: Removed empty contrib/launchpad/karaf/src directory Removed: sling/trunk/contrib/launchpad/karaf/src/
svn commit: r1505922 - in /sling/trunk/contrib/launchpad/karaf: org.apache.sling.launchpad.karaf-features/ org.apache.sling.launchpad.karaf-integration-tests/ org.apache.sling.launchpad.karaf/
Author: rombert Date: Tue Jul 23 07:21:08 2013 New Revision: 1505922 URL: http://svn.apache.org/r1505922 Log: Update svn:ignore for contrib/launchpad/karaf Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/ (props changed) sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/ (props changed) sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/ (props changed) Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 23 07:21:08 2013 @@ -0,0 +1,4 @@ +target +.classpath +.project +.settings Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 23 07:21:08 2013 @@ -0,0 +1,4 @@ +target +.classpath +.settings +.project Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/ -- --- svn:ignore (added) +++ svn:ignore Tue Jul 23 07:21:08 2013 @@ -0,0 +1,4 @@ +target +.classpath +.project +.settings
svn commit: r1506502 - in /sling/whiteboard/asanso/plugins/eclipse: eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java impl-resource/src/org/apache/sling/ide/impl/resource/trans
Author: rombert
Date: Wed Jul 24 11:27:52 2013
New Revision: 1506502
URL: http://svn.apache.org/r1506502
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Fix recursive imports.
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1506502r1=1506501r2=1506502view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
Wed Jul 24 11:27:52 2013
@@ -33,7 +33,6 @@ import org.apache.sling.ide.transport.Re
import org.apache.sling.ide.transport.RepositoryException;
import org.apache.sling.ide.transport.ResourceProxy;
import org.apache.sling.ide.transport.Result;
-import org.apache.sling.ide.util.PathUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -243,8 +242,14 @@ public class ImportWizard extends Wizard
}
}
+System.out.println(Children: + resource.getChildren());
+
for (ResourceProxy child : resource.getChildren()) {
+if
(Repository.NT_RESOURCE.equals(child.getProperties().get(Repository.JCR_PRIMARY_TYPE)))
{
+continue;
+}
+
if (filter != null) {
FilterResult filterResult = filter.filter(child.getPath());
if (filterResult == FilterResult.DENY) {
@@ -252,7 +257,7 @@ public class ImportWizard extends Wizard
}
}
-crawlChildrenAndImport(repository, filter, PathUtil.join(path,
child.getPath()), project,
+crawlChildrenAndImport(repository, filter, child.getPath(),
project,
projectRelativePath);
}
}
Modified:
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java?rev=1506502r1=1506501r2=1506502view=diff
==
---
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
(original)
+++
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Wed Jul 24 11:27:52 2013
@@ -17,8 +17,10 @@
package org.apache.sling.ide.impl.resource.transport;
import java.io.File;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.commons.httpclient.Credentials;
@@ -34,6 +36,7 @@ import org.apache.commons.httpclient.met
import org.apache.sling.ide.impl.resource.util.Tracer;
import org.apache.sling.ide.transport.Command;
import org.apache.sling.ide.transport.FileInfo;
+import org.apache.sling.ide.transport.ProtectedNodes;
import org.apache.sling.ide.transport.Repository;
import org.apache.sling.ide.transport.RepositoryException;
import org.apache.sling.ide.transport.ResourceProxy;
@@ -160,13 +163,16 @@ public class RepositoryImpl extends Abst
resource.addProperty(Repository.JCR_PRIMARY_TYPE,
primaryType);
}
+// TODO - populate all properties
+
for (Iterator? keyIterator = json.keys();
keyIterator.hasNext();) {
String key = (String) keyIterator.next();
JSONObject value = json.optJSONObject(key);
if (value != null) {
-ResourceProxy child = new ResourceProxy(key);
+ResourceProxy child = new
ResourceProxy(PathUtil.join(path, key));
child.addProperty(Repository.JCR_PRIMARY_TYPE,
value.optString(Repository.JCR_PRIMARY_TYPE));
+resource.addChild(child);
}
}
@@ -282,20 +288,24 @@ public class RepositoryImpl extends Abst
public ResultVoid execute() {
PostMethod post = new
PostMethod(createFullPath
svn commit: r1506637 - /sling/trunk/tooling/
Author: rombert Date: Wed Jul 24 17:39:40 2013 New Revision: 1506637 URL: http://svn.apache.org/r1506637 Log: SLING-2978 - Create tooling top-level directory and move maven and ide under it Created the tooling top-level directory in preparation for the actual movements. Added: sling/trunk/tooling/
svn commit: r1506645 - in /sling/trunk: ./ maven/ tooling/maven/ tooling/maven/adapter-annotations/ tooling/maven/apache-sling-jar-resource-bundle/ tooling/maven/archetypes/bundle-for-jcrinstall/ tool
Author: rombert Date: Wed Jul 24 18:13:22 2013 New Revision: 1506645 URL: http://svn.apache.org/r1506645 Log: SLING-2978 - Create tooling top-level directory and move maven and ide under it * moved the maven directory under tooling maven * adjusted module paths in pom.xml * updated the scm information in the pom.xml files * updated the scm information in the README.txt files Added: sling/trunk/tooling/maven/ - copied from r1506635, sling/trunk/maven/ Removed: sling/trunk/maven/ Modified: sling/trunk/pom.xml sling/trunk/tooling/maven/adapter-annotations/pom.xml sling/trunk/tooling/maven/apache-sling-jar-resource-bundle/pom.xml sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/README.txt sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml sling/trunk/tooling/maven/archetypes/bundle/README.txt sling/trunk/tooling/maven/archetypes/bundle/pom.xml sling/trunk/tooling/maven/archetypes/initial-content/README.txt sling/trunk/tooling/maven/archetypes/initial-content/pom.xml sling/trunk/tooling/maven/archetypes/launchpad-standalone/README.txt sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml sling/trunk/tooling/maven/archetypes/launchpad-webapp/README.txt sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml sling/trunk/tooling/maven/archetypes/servlet/README.txt sling/trunk/tooling/maven/archetypes/servlet/pom.xml sling/trunk/tooling/maven/archetypes/taglib/README.txt sling/trunk/tooling/maven/archetypes/taglib/pom.xml sling/trunk/tooling/maven/maven-jcrocm-plugin/README.txt sling/trunk/tooling/maven/maven-jcrocm-plugin/pom.xml sling/trunk/tooling/maven/maven-jspc-plugin/README.txt sling/trunk/tooling/maven/maven-jspc-plugin/pom.xml sling/trunk/tooling/maven/maven-launchpad-plugin/README.txt sling/trunk/tooling/maven/maven-launchpad-plugin/pom.xml sling/trunk/tooling/maven/maven-sling-plugin/README.txt sling/trunk/tooling/maven/maven-sling-plugin/pom.xml Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1506645r1=1506644r2=1506645view=diff == --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Wed Jul 24 18:13:22 2013 @@ -80,24 +80,24 @@ !-- List modules to be included in the build here ! -- modules -modulemaven/apache-sling-jar-resource-bundle/module +moduletooling/maven/apache-sling-jar-resource-bundle/module !-- The real Sling Parent Project -- moduleparent/module !-- The Maven Plugins and Archeyptes-- -modulemaven/adapter-annotations/module -modulemaven/maven-jcrocm-plugin/module -modulemaven/maven-jspc-plugin/module -modulemaven/maven-sling-plugin/module -modulemaven/maven-launchpad-plugin/module -modulemaven/archetypes/launchpad-standalone/module -modulemaven/archetypes/launchpad-webapp/module -modulemaven/archetypes/initial-content/module -modulemaven/archetypes/servlet/module -modulemaven/archetypes/bundle/module -modulemaven/archetypes/bundle-for-jcrinstall/module -modulemaven/archetypes/taglib/module +moduletooling/maven/adapter-annotations/module +moduletooling/maven/maven-jcrocm-plugin/module +moduletooling/maven/maven-jspc-plugin/module +moduletooling/maven/maven-sling-plugin/module +moduletooling/maven/maven-launchpad-plugin/module +moduletooling/maven/archetypes/launchpad-standalone/module +moduletooling/maven/archetypes/launchpad-webapp/module +moduletooling/maven/archetypes/initial-content/module +moduletooling/maven/archetypes/servlet/module +moduletooling/maven/archetypes/bundle/module +moduletooling/maven/archetypes/bundle-for-jcrinstall/module +moduletooling/maven/archetypes/taglib/module !-- The Sling API -- modulebundles/api/module Modified: sling/trunk/tooling/maven/adapter-annotations/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/adapter-annotations/pom.xml?rev=1506645r1=1506635r2=1506645view=diff == --- sling/trunk/tooling/maven/adapter-annotations/pom.xml (original) +++ sling/trunk/tooling/maven/adapter-annotations/pom.xml Wed Jul 24 18:13:22 2013 @@ -33,8 +33,8 @@ descriptionAnnotations used to generate Sling Adapter metadata/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/maven/adapter-annotations/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/maven/adapter-annotations/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/maven/adapter-annotations/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk
svn commit: r1506951 - in /sling: trunk/tooling/ide/ trunk/tooling/ide/api/ trunk/tooling/ide/eclipse-core/ trunk/tooling/ide/eclipse-ui/ trunk/tooling/ide/feature/ trunk/tooling/ide/impl-resource-tes
Author: rombert Date: Thu Jul 25 13:02:46 2013 New Revision: 1506951 URL: http://svn.apache.org/r1506951 Log: SLING-2978 - Create tooling top-level directory and move maven and ide under it Moved the current IDE tooling from whiteboard/asanso to trunk/tooling/ide. Added: sling/trunk/tooling/ide/ (props changed) - copied from r1506918, sling/whiteboard/asanso/plugins/eclipse/ Removed: sling/whiteboard/asanso/plugins/eclipse/ Modified: sling/trunk/tooling/ide/api/ (props changed) sling/trunk/tooling/ide/eclipse-core/ (props changed) sling/trunk/tooling/ide/eclipse-core/plugin.xml sling/trunk/tooling/ide/eclipse-ui/ (props changed) sling/trunk/tooling/ide/eclipse-ui/plugin.xml sling/trunk/tooling/ide/feature/ (props changed) sling/trunk/tooling/ide/impl-resource/ (props changed) sling/trunk/tooling/ide/impl-resource-test/ (props changed) sling/trunk/tooling/ide/p2update/ (props changed) Propchange: sling/trunk/tooling/ide/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +.settings +.project +.classpath +target Propchange: sling/trunk/tooling/ide/api/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Propchange: sling/trunk/tooling/ide/eclipse-core/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 25 13:02:46 2013 @@ -0,0 +1,4 @@ +target +.settings +.project +.classpath Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1506951r1=1506918r2=1506951view=diff == --- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original) +++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Thu Jul 25 13:02:46 2013 @@ -1,126 +1,126 @@ -?xml version=1.0 encoding=UTF-8? -?eclipse version=3.0? -plugin - - !-- Define the sling module type -- - extension point=org.eclipse.wst.server.core.moduleTypes -moduleType - id=sling.content - name=Sling module type/ - /extension - - !-- Define a sling module factory -- - extension point=org.eclipse.wst.server.core.moduleFactories - moduleFactory - projects=true - class=org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory - id=org.apache.sling.ide.contentModuleFactory - moduleType - versions=1.0 - types=sling.content/ - /moduleFactory - /extension - - !-- Define the sling facet we support -- - extension point=org.eclipse.wst.common.project.facet.core.facets - project-facet id=sling.content - labelSling content module/label - descriptionSling content modules contain content which is installed into the repository as-is. Good examples are static files ( HTML, CSS, JS ), scripts ( JSP, ESP ) and any other form of content./description - /project-facet - - project-facet-version facet=sling.content version=1.0/ - - action facet=sling.content version=1.0 type=INSTALL - delegate class=org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate/ - /action - - action facet=sling.content version=1.0 type=UNINSTALL - delegate class=org.apache.sling.ide.eclipse.core.internal.SlingContentFacetUninstallDelegate/ - /action - /extension - - !-- Define the Sling launchpad runtime type -- - extension point=org.eclipse.wst.server.core.runtimeTypes -runtimeType - id=org.apache.sling.ide.launchpadRuntimeType - name=Sling Launchpad (runtime name) - description=Sling Launchpad (runtime description) - vendor=Sling - version=1.0 - class=org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime - moduleType types=sling.content versions=1.0/ -/runtimeType - /extension - - !-- Define the Sling launchpad server type -- - extension point=org.eclipse.wst.server.core.serverTypes - serverType - id=org.apache.sling.ide.launchpadServer - name=Sling Launchpad (server name) - description=Sling Launchpad (server description) - supportsRemoteHosts=true - runtime=true - startTimeout=3 - stopTimeout=15000 - initialState=stopped - hasConfiguration=true - launchConfigId=org.apache.sling.ide.launchpadLaunchConfigurationType - runtimeTypeId=org.apache.sling.ide.launchpadRuntimeType - class
svn commit: r1508099 - in /sling/trunk/contrib/launchpad/karaf: ./ org.apache.sling.launchpad.karaf-features/ org.apache.sling.launchpad.karaf-features/src/main/feature/ org.apache.sling.launchpad.kar
Author: rombert
Date: Mon Jul 29 15:29:37 2013
New Revision: 1508099
URL: http://svn.apache.org/r1508099
Log:
SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails
Applied patch SLING-2789.2013-07-25.a.patch from Oliver Lietz.
- removed 'BUILD' component from versions
- misc version updates
Modified:
sling/trunk/contrib/launchpad/karaf/README.txt
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
sling/trunk/contrib/launchpad/karaf/pom.xml
Modified: sling/trunk/contrib/launchpad/karaf/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/README.txt?rev=1508099r1=1508098r2=1508099view=diff
==
--- sling/trunk/contrib/launchpad/karaf/README.txt (original)
+++ sling/trunk/contrib/launchpad/karaf/README.txt Mon Jul 29 15:29:37 2013
@@ -39,7 +39,7 @@ How to deploy this
2) Add the Apache Sling features repository and install:
- karaf@root() feature:repo-add
mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0.BUILD-SNAPSHOT/xml/features
+ karaf@root() feature:repo-add
mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0-SNAPSHOT/xml/features
karaf@root() feature:install sling-karaf
3) Install Launchpad content and Explorer:
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1508099r1=1508098r2=1508099view=diff
==
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
Mon Jul 29 15:29:37 2013
@@ -24,12 +24,12 @@
parent
groupIdorg.apache.sling/groupId
artifactIdsling/artifactId
-version16/version
+version17/version
relativePath../../../../parent/pom.xml/relativePath
/parent
artifactIdorg.apache.sling.launchpad.karaf-features/artifactId
- version0.1.0.BUILD-SNAPSHOT/version
+ version0.1.0-SNAPSHOT/version
packagingfeature/packaging
nameApache Sling Launchpad Karaf - Features/name
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1508099r1=1508098r2=1508099view=diff
==
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Mon Jul 29 15:29:37 2013
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=UTF-8?
features name=sling-launchpad-karaf
xmlns=http://karaf.apache.org/xmlns/features/v1.2.0;
- feature name=sling-karaf-requirements version=0.1.0.BUILD-SNAPSHOT
+ feature name=sling-karaf-requirements version=${project.version}
!-- features (some are part of Karaf's defaults)--
featureconfig/feature
featureeventadmin/feature
@@ -31,7 +31,7 @@
bundle
dependency=truemvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4/bundle
bundle
dependency=truemvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0/bundle
/feature
- feature name=sling-karaf version=0.1.0.BUILD-SNAPSHOT
+ feature name=sling-karaf version=${project.version}
featuresling-karaf-requirements/feature
!-- Apache Commons --
bundle dependency=truemvn:commons-codec/commons-codec/1.6/bundle
@@ -87,12 +87,12 @@
bundlemvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.6/bundle
!-- Apache Sling Launchpad --
bundlemvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0/bundle
-
bundlemvn:org.apache.sling/org.apache.sling.launchpad.karaf/0.1.0.BUILD-SNAPSHOT/bundle
+
bundlemvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}/bundle
!-- Apache Sling JCR --
bundlemvn:org.apache.sling/org.apache.sling.jcr.api/2.1.0/bundle
bundlemvn:org.apache.sling/org.apache.sling.jcr.base/2.1.2/bundle
bundlemvn:org.apache.sling/org.apache.sling.jcr.classloader/3.1.12/bundle
svn commit: r1508100 - /sling/trunk/contrib/pom.xml
Author: rombert Date: Mon Jul 29 15:29:50 2013 New Revision: 1508100 URL: http://svn.apache.org/r1508100 Log: SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails Re-added the launchpad/karaf module to the contrib reactor. Modified: sling/trunk/contrib/pom.xml Modified: sling/trunk/contrib/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1508100r1=1508099r2=1508100view=diff == --- sling/trunk/contrib/pom.xml (original) +++ sling/trunk/contrib/pom.xml Mon Jul 29 15:29:50 2013 @@ -103,9 +103,7 @@ modulejcr/jackrabbit-client/module modulejcr/compiler/module modulejcr/prefs/module - !-- modulelaunchpad/karaf/module - -- modulelaunchpad/testing/module modulescripting/script-console/module modulescripting/jsp-taglib-atom/module
svn commit: r1512262 - in /sling/trunk: bundles/extensions/event/.gitignore contrib/.gitignore
Author: rombert Date: Fri Aug 9 11:27:30 2013 New Revision: 1512262 URL: http://svn.apache.org/r1512262 Log: Updated .gitignore files Now after a 'mvn clean verify -fae' there are no untracked file. Added: sling/trunk/bundles/extensions/event/.gitignore Modified: sling/trunk/contrib/.gitignore Added: sling/trunk/bundles/extensions/event/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/.gitignore?rev=1512262view=auto == --- sling/trunk/bundles/extensions/event/.gitignore (added) +++ sling/trunk/bundles/extensions/event/.gitignore Fri Aug 9 11:27:30 2013 @@ -0,0 +1 @@ +jackrabbit Modified: sling/trunk/contrib/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/contrib/.gitignore?rev=1512262r1=1512261r2=1512262view=diff == --- sling/trunk/contrib/.gitignore (original) +++ sling/trunk/contrib/.gitignore Fri Aug 9 11:27:30 2013 @@ -1 +1,3 @@ /sling/ +/launchpad/testing/cachedir/ +/launchpad/testing/sling/
svn commit: r1512260 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert Date: Fri Aug 9 11:27:15 2013 New Revision: 1512260 URL: http://svn.apache.org/r1512260 Log: SLING-3005 - Event integration tests: update bundle versions for jackrabbit.server, tika Updated tika versions, jackrabbit.server was already up-to-date. Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1512260r1=1512259r2=1512260view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Fri Aug 9 11:27:15 2013 @@ -95,8 +95,8 @@ public abstract class AbstractJobHandlin mavenBundle(commons-lang, commons-lang, 2.5), mavenBundle(org.apache.geronimo.bundles, commons-httpclient, 3.1_1), -mavenBundle(org.apache.tika, tika-core, 1.0), -mavenBundle(org.apache.tika, tika-bundle, 1.0), +mavenBundle(org.apache.tika, tika-core, 1.2), +mavenBundle(org.apache.tika, tika-bundle, 1.2), mavenBundle(org.apache.felix, org.apache.felix.http.jetty, 2.2.0), mavenBundle(org.apache.felix, org.apache.felix.eventadmin, 1.2.14),
svn commit: r1512261 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/
Author: rombert
Date: Fri Aug 9 11:27:24 2013
New Revision: 1512261
URL: http://svn.apache.org/r1512261
Log:
SLING-3004 - Event ITs should use timeouts
Updated all test methods to specify a default timeout.
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1512261r1=1512260r2=1512261view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Fri Aug 9 11:27:24 2013
@@ -52,6 +52,8 @@ public abstract class AbstractJobHandlin
private static final String BUNDLE_JAR_SYS_PROP = project.bundle.file;
+protected static final int DEFAULT_TEST_TIMEOUT = 1000*60*5;
+
@Inject
protected EventAdmin eventAdmin;
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1512261r1=1512260r2=1512261view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Fri Aug 9 11:27:24 2013
@@ -87,7 +87,7 @@ public class ClassloadingTest extends Ab
}
-@Test
+@Test(timeout = DEFAULT_TEST_TIMEOUT)
public void testSimpleClassloading() throws Exception {
final AtomicInteger processedJobsCount = new AtomicInteger(0);
final ListEvent finishedEvents = Collections.synchronizedList(new
ArrayListEvent());
@@ -161,7 +161,7 @@ public class ClassloadingTest extends Ab
}
}
-@Test
+@Test(timeout = DEFAULT_TEST_TIMEOUT)
public void testFailedClassloading() throws Exception {
final AtomicInteger failedJobsCount = new AtomicInteger(0);
final ListEvent finishedEvents = Collections.synchronizedList(new
ArrayListEvent());
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java?rev=1512261r1=1512260r2=1512261view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
Fri Aug 9 11:27:24 2013
@@ -34,6 +34,7 @@ import org.apache.sling.event.jobs.Queue
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -76,7 +77,8 @@ public class DropQueueTest extends Abstr
}
-@org.junit.Test public void testDroppingQueue() throws Exception {
+@Test(timeout = DEFAULT_TEST_TIMEOUT)
+public void testDroppingQueue() throws Exception {
final AtomicInteger count = new AtomicInteger(0);
final AtomicInteger dropCount = new AtomicInteger(0);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java?rev=1512261r1=1512260r2=1512261view=diff
svn commit: r1512268 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Author: rombert Date: Fri Aug 9 11:56:03 2013 New Revision: 1512268 URL: http://svn.apache.org/r1512268 Log: SLING-2923 - release org.apache.sling.jcr.jackrabbit.server 2.1.1 Updated karaf feature.xml to refer to o.a.s.jcr.jackrabbit.server 2.1.2 Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1512268r1=1512267r2=1512268view=diff == --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Fri Aug 9 11:56:03 2013 @@ -102,8 +102,7 @@ bundlemvn:org.apache.sling/org.apache.sling.jcr.webdav/2.1.2/bundle !-- Apache Sling JCR Jackrabbit -- bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0/bundle -!-- org.apache.sling.jcr.jackrabbit.server 2.1.0 is broken, problems with Tika -- - bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.1-SNAPSHOT/bundle + bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.2/bundle bundlemvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0/bundle !-- Apache Sling Scripting -- bundlemvn:org.apache.sling/org.apache.sling.scripting.api/2.1.4/bundle
svn commit: r1512503 - in /sling/trunk/tooling/ide: api/src/org/apache/sling/ide/transport/ impl-resource/OSGI-INF/ impl-resource/src/org/apache/sling/ide/impl/resource/transport/ impl-resource/src/or
Author: rombert
Date: Fri Aug 9 21:31:02 2013
New Revision: 1512503
URL: http://svn.apache.org/r1512503
Log:
SLING-2667 - [Tooling] create text-only console that exposes the
operations performed and their results
Modify the Tracer to be bound to the EventAdmin as well.
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java
sling/trunk/tooling/ide/impl-resource/OSGI-INF/RepositoryImpl.xml
sling/trunk/tooling/ide/impl-resource/OSGI-INF/Tracer.xml
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java?rev=1512503r1=1512502r2=1512503view=diff
==
---
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java
(original)
+++
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/CommandExecutionProperties.java
Fri Aug 9 21:31:02 2013
@@ -17,6 +17,8 @@
public final class CommandExecutionProperties {
+public static final String TOPIC =
Repository.class.getPackage().getName().replace('.', '/');
+
public static final String TIMESTAMP_START = timestamp.start;
public static final String TIMESTAMP_END = timestamp.end;
public static final String ACTION_TYPE = action.type;
Modified: sling/trunk/tooling/ide/impl-resource/OSGI-INF/RepositoryImpl.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/OSGI-INF/RepositoryImpl.xml?rev=1512503r1=1512502r2=1512503view=diff
==
--- sling/trunk/tooling/ide/impl-resource/OSGI-INF/RepositoryImpl.xml (original)
+++ sling/trunk/tooling/ide/impl-resource/OSGI-INF/RepositoryImpl.xml Fri Aug
9 21:31:02 2013
@@ -4,6 +4,5 @@
service
provide interface=org.apache.sling.ide.transport.Repository/
/service
- reference bind=bindTracer cardinality=1..1
interface=org.apache.sling.ide.impl.resource.util.Tracer name=Tracer
policy=static unbind=unbindTracer/
reference bind=bindEventAdmin cardinality=1..1
interface=org.osgi.service.event.EventAdmin name=EventAdmin policy=static
unbind=unbindEventAdmin/
/scr:component
Modified: sling/trunk/tooling/ide/impl-resource/OSGI-INF/Tracer.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/OSGI-INF/Tracer.xml?rev=1512503r1=1512502r2=1512503view=diff
==
--- sling/trunk/tooling/ide/impl-resource/OSGI-INF/Tracer.xml (original)
+++ sling/trunk/tooling/ide/impl-resource/OSGI-INF/Tracer.xml Fri Aug 9
21:31:02 2013
@@ -2,8 +2,10 @@
scr:component xmlns:scr=http://www.osgi.org/xmlns/scr/v1.1.0;
immediate=false
implementation class=org.apache.sling.ide.impl.resource.util.Tracer/
property name=listener.symbolic.name type=String
value=org.apache.sling.ide.impl-resource/
+ property name=event.topics value=org/apache/sling/ide/transport/
service
provide interface=org.apache.sling.ide.impl.resource.util.Tracer/
provide
interface=org.eclipse.osgi.service.debug.DebugOptionsListener/
+ provide interface=org.osgi.service.event.EventHandler/
/service
/scr:component
Modified:
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java?rev=1512503r1=1512502r2=1512503view=diff
==
---
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
(original)
+++
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Fri Aug 9 21:31:02 2013
@@ -19,7 +19,6 @@ package org.apache.sling.ide.impl.resour
import java.util.Map;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.sling.ide.impl.resource.util.Tracer;
import org.apache.sling.ide.transport.Command;
import org.apache.sling.ide.transport.FileInfo;
import org.apache.sling.ide.transport.ResourceProxy;
@@ -28,7 +27,6 @@ import org.osgi.service.event.EventAdmin
public class RepositoryImpl extends AbstractRepository{
private final HttpClient httpClient = new HttpClient();
-private Tracer tracer;
private EventAdmin eventAdmin;
@Override
@@ -36,9
svn commit: r1513114 - /sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
Author: rombert
Date: Mon Aug 12 11:42:02 2013
New Revision: 1513114
URL: http://svn.apache.org/r1513114
Log:
SLING-3011 - Bind the launchpad:prepare-package goal to the
prepare-package lifecycle phase
Changed the phase from process-sources to prepare-package.
Modified:
sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
Modified:
sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java?rev=1513114r1=1513113r2=1513114view=diff
==
---
sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
(original)
+++
sling/trunk/tooling/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/PreparePackageMojo.java
Mon Aug 12 11:42:02 2013
@@ -41,7 +41,7 @@ import org.codehaus.plexus.util.FileUtil
*
* @goal prepare-package
* @requiresDependencyResolution test
- * @phase process-sources
+ * @phase prepare-package
* @description initialize a Sling application project
*/
public class PreparePackageMojo extends AbstractLaunchpadFrameworkMojo {
svn commit: r1513125 - /sling/trunk/launchpad/integration-tests/pom.xml
Author: rombert Date: Mon Aug 12 12:59:57 2013 New Revision: 1513125 URL: http://svn.apache.org/r1513125 Log: SLING-3013 - Launchpad integration tests: avoid mixing junit and junit-dep artifacts Exclude transitive dep on junit:junit-dep. Modified: sling/trunk/launchpad/integration-tests/pom.xml Modified: sling/trunk/launchpad/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/pom.xml?rev=1513125r1=1513124r2=1513125view=diff == --- sling/trunk/launchpad/integration-tests/pom.xml (original) +++ sling/trunk/launchpad/integration-tests/pom.xml Mon Aug 12 12:59:57 2013 @@ -137,6 +137,10 @@ groupIdorg.slf4j/groupId artifactIdslf4j-simple/artifactId /exclusion +exclusion + groupIdjunit/groupId + artifactIdjunit-dep/artifactId +/exclusion /exclusions /dependency
svn commit: r1514633 - /sling/branches/tooling-ide-vlt/
Author: rombert Date: Fri Aug 16 09:41:57 2013 New Revision: 1514633 URL: http://svn.apache.org/r1514633 Log: Created branch for integrating FileVault into the IDE tooling Added: sling/branches/tooling-ide-vlt/ - copied from r1514626, sling/trunk/
svn commit: r1514761 - in /sling/branches/tooling-ide-vlt/tooling/ide: ./ target-definition/ vlt-wrapper/ vlt-wrapper/META-INF/ vlt-wrapper/lib/
Author: rombert Date: Fri Aug 16 15:52:46 2013 New Revision: 1514761 URL: http://svn.apache.org/r1514761 Log: SLING-2989 - [Tooling] integrate with vlt once available Create a vlt-wrapper bundle which wraps and re-export the org.apache.jackrabbit.vault.* packages, and also javax.jcr. Added: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/build.properties (with props) sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-client-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr-commons-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-jcr2spi-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi-commons-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-spi2dav-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jackrabbit-webdav-2.4.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/jcr-2.0.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/org.apache.jackrabbit.vault-3.0.0-SNAPSHOT.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/lib/vault-davex-3.0.0-SNAPSHOT.jar sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/pom.xml (with props) Modified: sling/branches/tooling-ide-vlt/tooling/ide/pom.xml sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Modified: sling/branches/tooling-ide-vlt/tooling/ide/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/pom.xml?rev=1514761r1=1514760r2=1514761view=diff == --- sling/branches/tooling-ide-vlt/tooling/ide/pom.xml (original) +++ sling/branches/tooling-ide-vlt/tooling/ide/pom.xml Fri Aug 16 15:52:46 2013 @@ -13,6 +13,7 @@ moduleapi/module moduleimpl-resource/module moduleimpl-resource-test/module + modulevlt-wrapper/module moduleeclipse-core/module moduleeclipse-ui/module modulefeature/module Modified: sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1514761r1=1514760r2=1514761view=diff == --- sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target (original) +++ sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Fri Aug 16 15:52:46 2013 @@ -1,17 +1,20 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -?pde version=3.8?target name=Sling IDE Tools sequenceNumber=8 +?pde version=3.8?target name=Sling IDE Tools sequenceNumber=11 locations location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit -unit id=org.apache.commons.httpclient version=3.1.0.v201012070820/ -unit id=org.json version=1.0.0.v201011060100/ -repository location=http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/ -/location -location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit unit id=org.eclipse.wst.server_adapters.feature.feature.group version=3.2.100.v20110303-51EoAkF77g8HBSc/ unit id=org.eclipse.jdt.feature.group version=3.7.2.v20120120-1414-7z8gFcuFMP7BW5XTz0jLTnz0l9B1/ unit id=org.eclipse.platform.feature.group version=3.7.2.v20120207-1839-9gF7UHPDFxGjd-PqDr2jX_4yKaumkoHTz04_q-q/ unit id=org.eclipse.jst.enterprise_ui.feature.feature.group version=3.3.2.v20030500-7b7II1YFSK2WIuPRDEnExPV-RvTn/ repository location=http://download.eclipse.org/releases/indigo/ /location +location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit +unit id=org.json version=1.0.0.v201011060100/ +unit id=org.slf4j.api version=1.6.4.v20120130-2120/ +unit id=ch.qos.logback.slf4j version=1.0.0.v20120123-1500/ +unit id=org.apache.commons.collections version=3.2.0.v201005080500/ +unit id=org.apache.commons.httpclient version=3.1.0.v201012070820/ +repository location=http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/ +/location /locations /target Added: sling
svn commit: r1514762 - in /sling/branches/tooling-ide-vlt/tooling/ide: ./ impl-vlt/ impl-vlt/META-INF/ impl-vlt/OSGI-INF/ impl-vlt/src/ impl-vlt/src/org/ impl-vlt/src/org/apache/ impl-vlt/src/org/apac
Author: rombert Date: Fri Aug 16 15:53:04 2013 New Revision: 1514762 URL: http://svn.apache.org/r1514762 Log: SLING-2989 - [Tooling] integrate with vlt once available Added a impl-vlt which contains a simple read-only implementation of the Repository. I've verified that this runs against a stock sling launchpad instance and made sure that it has priority over the resource impl by giving it a higher service.ranking. Added: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/build.properties (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/pom.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ConversionUtils.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeCommand.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/NoOpCommand.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java (with props) Modified: sling/branches/tooling-ide-vlt/tooling/ide/pom.xml Added: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF?rev=1514762view=auto == --- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF (added) +++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF Fri Aug 16 15:53:04 2013 @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.apache.sling.ide.impl-vlt +Bundle-Version: 0.0.1.qualifier +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.eclipse.equinox.ds;bundle-version=1.2.1, + org.eclipse.osgi.services;bundle-version=3.2.100 +Import-Package: javax.jcr, + org.apache.jackrabbit.vault.fs.api, + org.apache.jackrabbit.vault.util, + org.apache.sling.ide.transport, + org.osgi.service.event;version=1.3.0 +Service-Component: OSGI-INF/*.xml Added: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml?rev=1514762view=auto == --- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml (added) +++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml Fri Aug 16 15:53:04 2013 @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=UTF-8? +scr:component xmlns:scr=http://www.osgi.org/xmlns/scr/v1.1.0; immediate=false + implementation class=org.apache.sling.ide.impl.vlt.VltRepository/ + service + provide interface=org.apache.sling.ide.transport.Repository/ + /service + reference bind=bindEventAdmin cardinality=1..1 interface=org.osgi.service.event.EventAdmin name=EventAdmin policy=static unbind=unbindEventAdmin/ +/scr:component Propchange: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml -- svn:eol-style = native Propchange: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml -- svn:mime-type = text/xml Added: sling
svn commit: r1514759 - in /sling/branches/tooling-ide-vlt/tooling/ide: api/META-INF/ api/src/org/apache/sling/ide/transport/ impl-resource/src/org/apache/sling/ide/impl/resource/transport/
Author: rombert
Date: Fri Aug 16 15:52:29 2013
New Revision: 1514759
URL: http://svn.apache.org/r1514759
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Make the TracingCommand part of the api bundle to allow other transport
implementations to reuse it.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
(contents, props changed)
- copied, changed from r1514633,
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
Removed:
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
Modified: sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF?rev=1514759r1=1514758r2=1514759view=diff
==
--- sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF
(original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/api/META-INF/MANIFEST.MF Fri Aug
16 15:52:29 2013
@@ -11,3 +11,4 @@ Export-Package: org.apache.sling.ide.fil
org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
org.apache.sling.ide.util
+Import-Package: org.osgi.service.event
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java?rev=1514759r1=1514758r2=1514759view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Command.java
Fri Aug 16 15:52:29 2013
@@ -19,4 +19,6 @@ package org.apache.sling.ide.transport;
public interface CommandT {
ResultT execute();
+
+String getPath();
}
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java?rev=1514759r1=1514758r2=1514759view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
Fri Aug 16 15:52:29 2013
@@ -87,8 +87,20 @@ public interface Repository {
CommandVoid newDeleteNodeCommand(FileInfo fileInfo);
+/**
+ * Retrieves information about the resource located at ttpath/tt and
its direct descendants
+ *
+ * @param path
+ * @return a ttResourceProxy/tt rooted at ttpath/tt and its direct
descendants
+ */
CommandResourceProxy newListChildrenNodeCommand(String path);
+/**
+ * Retrieves all properties of a resource located at ttpath/tt
+ *
+ * @param path
+ * @return all properties for the resource located at ttpath/tt
+ */
CommandMapString, Object newGetNodeContentCommand(String path);
Commandbyte[] newGetNodeCommand(String path);
Copied:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java
(from r1514633,
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java)
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.java?p2=sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/TracingCommand.javap1=sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.javar1=1514633r2=1514759rev=1514759view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/TracingCommand.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling
svn commit: r1519462 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Mon Sep 2 15:15:51 2013
New Revision: 1519462
URL: http://svn.apache.org/r1519462
Log:
SLING-3009 - [Tooling] support auto-deploy of osgi bundles from eclipse
to a running sling launchpad
Support run modes in a more general way - do not deploy the bundle if
the launch mode is set to DEBUG. This way we deploy the bundle even when
in profiling mode, and future modes are better supported.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1519462r1=1519461r2=1519462view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Mon Sep 2 15:15:51 2013
@@ -169,11 +169,12 @@ public class SlingLaunchpadBehaviour ext
System.out.println(trace.toString());
if (ProjectHelper.isBundleProject(module[0].getProject())) {
- if (getServer().getMode().equals(ILaunchManager.RUN_MODE)) {
+String serverMode = getServer().getMode();
+if (!serverMode.equals(ILaunchManager.DEBUG_MODE)) {
+// in debug mode, we rely on the hotcode replacement feature
of eclipse/jvm
+// otherwise, for run and profile modes we explicitly publish
the bundle module
+// TODO: make this configurable as part of the server config
publishBundleModule(module, monitor);
- } else {
- // otherwise, in debug mode, we rely on the hotcode
replacement feature of eclipse/jvm
- // TODO: make this configurable as part of the server
config
}
} else if (ProjectHelper.isContentProject(module[0].getProject())) {
publishContentModule(kind, deltaKind, module, monitor);
@@ -351,7 +352,6 @@ public class SlingLaunchpadBehaviour ext
// IWorkbenchWindow aw =
workbench.getActiveWorkbenchWindow();
// if (aw==null) {
// // we're not in the context of
a workbench window?
-// System.err.println(We're not
in the context of a workbench window?);
// }
ILaunchConfiguration launchConfig =
DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(aLaunchFile);
svn commit: r1520304 - /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Author: rombert
Date: Thu Sep 5 13:40:04 2013
New Revision: 1520304
URL: http://svn.apache.org/r1520304
Log:
SLING-2989 - [Tooling] integrate with vlt once available
VaultFsLocator: use vault constants
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java?rev=1520304r1=1520303r2=1520304view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Thu Sep 5 13:40:04 2013
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.config.AbstractVaultFsConfig;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
+import org.apache.jackrabbit.vault.util.Constants;
public class VaultFsLocatorImpl implements VaultFsLocator {
@@ -45,13 +46,13 @@ public class VaultFsLocatorImpl implemen
filter.load(filterFile);
}
-File metaInfDir = new File(contentSyncRoot.getParent(), META-INF);
+File metaInfDir = new File(contentSyncRoot.getParent(),
Constants.META_INF);
if (metaInfDir.isDirectory()) {
-File vaultDir = new File(metaInfDir, vault);
+File vaultDir = new File(metaInfDir, Constants.VAULT_DIR);
if (vaultDir.isDirectory()) {
-File configFile = new File(vaultDir, config.xml);
+File configFile = new File(vaultDir, Constants.CONFIG_XML);
config = AbstractVaultFsConfig.load(configFile);
}
}
@@ -62,16 +63,16 @@ public class VaultFsLocatorImpl implemen
@Override
public File findFilterFile(File contentSyncRoot) {
-File metaInfDir = new File(contentSyncRoot.getParent(), META-INF);
+File metaInfDir = new File(contentSyncRoot.getParent(),
Constants.META_INF);
if (metaInfDir.isDirectory()) {
-File vaultDir = new File(metaInfDir, vault);
+File vaultDir = new File(metaInfDir, Constants.VAULT_DIR);
if (vaultDir.isDirectory()) {
-File filterFile = new File(vaultDir, filter-vlt.xml);
+File filterFile = new File(vaultDir, Constants.FILTER_VLT_XML);
if (filterFile.isFile()) {
return filterFile;
} else {
-filterFile = new File(vaultDir, filter.xml);
+filterFile = new File(vaultDir, Constants.FILTER_XML);
if (filterFile.isFile()) {
return filterFile;
}
svn commit: r1520302 - in /sling/branches/tooling-ide-vlt/tooling/ide: api/src/org/apache/sling/ide/serialization/ api/src/org/apache/sling/ide/transport/ eclipse-ui/src/org/apache/sling/ide/eclipse/u
Author: rombert
Date: Thu Sep 5 13:39:33 2013
New Revision: 1520302
URL: http://svn.apache.org/r1520302
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Have a (seemingly) functional checkout with .content.xml from a Sling
repo
TODO:
- very very slow
- no filtering , we use the default workspace filters
- still no write support
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VaultFsLocatorImpl.xml
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltSerializationManagerImpl.xml
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/RepositoryUtils.java
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocator.java
- copied, changed from r1514762,
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
- copied, changed from r1514762,
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
(with props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource-test/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/GetNodeContentCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltRepository.xml
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/GetNodeContentCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ListChildrenCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java
sling/branches/tooling-ide-vlt/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target
sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java?rev=1520302r1=1520301r2=1520302view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
Thu Sep 5 13:39:33 2013
@@ -20,6 +20,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
+import org.apache.sling.ide.transport.RepositoryInfo;
+import org.apache.sling.ide.transport.ResourceProxy;
+
public interface SerializationManager {
boolean isSerializationFile(String filePath);
@@ -28,7 +31,7 @@ public interface SerializationManager {
String getSerializationFilePath(String baseFilePath);
-String buildSerializationData(MapString, Object content) throws
IOException;
+String buildSerializationData(ResourceProxy resource, RepositoryInfo
repositoryInfo) throws IOException;
MapString, Object readSerializationData(InputStream source) throws
IOException;
}
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/Repository.java
URL:
http://svn.apache.org/viewvc/sling
svn commit: r1520305 - /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
Author: rombert
Date: Thu Sep 5 13:40:11 2013
New Revision: 1520305
URL: http://svn.apache.org/r1520305
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Meaningful toString() for JcrResult
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java?rev=1520305r1=1520304r2=1520305view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrResult.java
Thu Sep 5 13:40:11 2013
@@ -56,4 +56,19 @@ public class JcrResultT implements Res
return success;
}
+@Override
+public String toString() {
+StringBuilder out = new StringBuilder();
+out.append(getClass().getSimpleName()).append([
success:).append(success);
+
+if (exception != null)
+out.append(, exception:
).append(exception.getClass().getName()).append( - )
+.append(exception.getMessage());
+
+out.append(']');
+
+return out.toString();
+
+}
+
}
svn commit: r1520303 - in /sling/branches/tooling-ide-vlt/tooling/ide: api/src/org/apache/sling/ide/filter/ api/src/org/apache/sling/ide/serialization/ eclipse-core/src/org/apache/sling/ide/eclipse/co
Author: rombert
Date: Thu Sep 5 13:39:57 2013
New Revision: 1520303
URL: http://svn.apache.org/r1520303
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Added basic filter support
The filter is possibly broken because we use filesystem paths for
filtering, while the filters possibly use JCR paths.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/OSGI-INF/VltFilterLocator.xml
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilter.java
(with props)
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
(with props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/FilterLocator.java
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource-test/src/test/java/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManagerTest.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilter.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocator.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java?rev=1520303r1=1520302r2=1520303view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/Filter.java
Thu Sep 5 13:39:57 2013
@@ -16,6 +16,10 @@
*/
package org.apache.sling.ide.filter;
+import java.io.File;
+
+import org.apache.sling.ide.transport.RepositoryInfo;
+
public interface Filter {
/**
@@ -23,5 +27,5 @@ public interface Filter {
* @param relativeFilePath a relative path
* @return the filter result
*/
-FilterResult filter(String relativeFilePath);
+FilterResult filter(File contentSyncRoot, String relativeFilePath,
RepositoryInfo repositoryInfo);
}
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/FilterLocator.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/FilterLocator.java?rev=1520303r1=1520302r2=1520303view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/FilterLocator.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/filter/FilterLocator.java
Thu Sep 5 13:39:57 2013
@@ -22,6 +22,7 @@ import java.io.InputStream;
public interface FilterLocator {
+// TODO - should be File[] to allow multiple lookups, see {filter-vlt.xml,
filter.xml}
File findFilterLocation(File syncDirectory);
Filter loadFilter(InputStream filterFileContents) throws IOException;
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java?rev=1520303r1=1520302r2=1520303view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/serialization/SerializationManager.java
Thu Sep 5
svn commit: r1520306 - /sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java
Author: rombert
Date: Thu Sep 5 13:40:21 2013
New Revision: 1520306
URL: http://svn.apache.org/r1520306
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Javadoc for FileInfo
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java?rev=1520306r1=1520305r2=1520306view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/api/src/org/apache/sling/ide/transport/FileInfo.java
Thu Sep 5 13:40:21 2013
@@ -36,6 +36,9 @@ public class FileInfo {
this.relativeLocation = relativeLocation;
}
+/**
+ * @return the absolute location of the file on the filesystem
+ */
public String getLocation() {
return location;
}
@@ -44,6 +47,9 @@ public class FileInfo {
return name;
}
+/**
+ * @return the location of the file relative to the repository root
+ */
public String getRelativeLocation() {
return relativeLocation;
}
svn commit: r1520307 - /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Author: rombert
Date: Thu Sep 5 13:40:28 2013
New Revision: 1520307
URL: http://svn.apache.org/r1520307
Log:
SLING-2989 - [Tooling] integrate with vlt once available
JcrCommand: logout from session after work is done.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java?rev=1520307r1=1520306r2=1520307view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Thu Sep 5 13:40:28 2013
@@ -47,8 +47,9 @@ public abstract class JcrCommandT impl
@Override
public ResultT execute() {
+Session session = null;
try {
-Session session = repository.login(credentials);
+session = repository.login(credentials);
return JcrResult.success(execute0(session));
} catch (LoginException e) {
@@ -57,6 +58,9 @@ public abstract class JcrCommandT impl
return JcrResult.failure(e);
} catch (IOException e) {
return JcrResult.failure(e);
+} finally {
+if (session != null)
+session.logout();
}
}
svn commit: r1520308 - /sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
Author: rombert Date: Thu Sep 5 13:40:33 2013 New Revision: 1520308 URL: http://svn.apache.org/r1520308 Log: SLING-2989 - [Tooling] integrate with vlt once available vlt-wrapper: add more package imports Modified: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF Modified: sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF?rev=1520308r1=1520307r2=1520308view=diff == --- sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF (original) +++ sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF Thu Sep 5 13:40:33 2013 @@ -40,7 +40,9 @@ Require-Bundle: org.eclipse.core.runtime Import-Package: org.apache.commons.httpclient;version=3.1.0, org.apache.commons.httpclient.auth;version=3.1.0, org.apache.commons.httpclient.methods;version=3.1.0, + org.apache.commons.httpclient.methods.multipart;version=3.1.0, org.apache.commons.httpclient.params;version=3.1.0, + org.apache.commons.httpclient.util;version=3.1.0, org.apache.commons.collections.map, org.apache.commons.collections.list, org.apache.commons.logging,
svn commit: r1520311 - in /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt: AddNodeCommand.java VltRepository.java
Author: rombert
Date: Thu Sep 5 13:40:48 2013
New Revision: 1520311
URL: http://svn.apache.org/r1520311
Log:
SLING-2989 - [Tooling] integrate with vlt once available
First implementation of the AddNodeCommand.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
(with props)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java?rev=1520311view=auto
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
(added)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
Thu Sep 5 13:40:48 2013
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.impl.vlt;
+
+import static org.apache.jackrabbit.vault.util.JcrConstants.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import javax.jcr.Binary;
+import javax.jcr.Credentials;
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.vault.util.PathUtil;
+import org.apache.jackrabbit.vault.util.Text;
+import org.apache.sling.ide.transport.FileInfo;
+
+public class AddNodeCommand extends JcrCommandVoid {
+
+private final FileInfo fileInfo;
+
+public AddNodeCommand(Repository repository, Credentials credentials,
FileInfo fileInfo) {
+
+super(repository, credentials,
PathUtil.makePath(fileInfo.getRelativeLocation(), fileInfo.getName()));
+
+this.fileInfo = fileInfo;
+}
+
+@Override
+protected Void execute0(Session session) throws RepositoryException,
IOException {
+
+// TODO - avoid IO
+File file = new File(fileInfo.getLocation());
+boolean isDirectory = file.isDirectory();
+
+boolean nodeExists = session.nodeExists(getPath());
+Node node;
+if ( nodeExists ) {
+node = session.getNode(getPath());
+} else {
+
+String parentLocation = Text.getAbsoluteParent(getPath(), 1);
+if ( !session.nodeExists(parentLocation)) {
+throw new RepositoryException(No parent found at +
parentLocation
++ ; it's needed to create node at + getPath());
+}
+
+// TODO - we probably need to .content.xml as well and do all
operations in one shot
+// and set the primary type properly
+String primaryType = file.isDirectory() ? NT_FOLDER : NT_FILE;
+
+node = session.getNode(parentLocation).addNode(fileInfo.getName(),
primaryType);
+}
+
+if (!isDirectory) {
+Node contentNode;
+
+if ( node.hasNode(JCR_CONTENT)) {
+contentNode = node.getNode(JCR_CONTENT);
+} else {
+contentNode = node.addNode(JCR_CONTENT, NT_RESOURCE);
+}
+
+Binary binary = session.getValueFactory().createBinary(new
FileInputStream(file));
+contentNode.setProperty(JCR_DATA, binary);
+}
+
+return null;
+}
+
+}
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
--
svn:eol-style = native
Propchange:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddNodeCommand.java
--
svn:keywords = Author Date Id Revision Rev URL
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepository.java
URL:
http://svn.apache.org/viewvc
svn commit: r1520310 - /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Author: rombert
Date: Thu Sep 5 13:40:40 2013
New Revision: 1520310
URL: http://svn.apache.org/r1520310
Log:
SLING-2989 - [Tooling] integrate with vlt once available
JcrCommand: use session.save()
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java?rev=1520310r1=1520309r2=1520310view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/JcrCommand.java
Thu Sep 5 13:40:40 2013
@@ -51,7 +51,11 @@ public abstract class JcrCommandT impl
try {
session = repository.login(credentials);
-return JcrResult.success(execute0(session));
+T result = execute0(session);
+
+session.save();
+
+return JcrResult.success(result);
} catch (LoginException e) {
return JcrResult.failure(e);
} catch (RepositoryException e) {
svn commit: r1521146 - in /sling/branches/tooling-ide-vlt/tooling/ide: ./ impl-vlt-test/ impl-vlt-test/src/ impl-vlt-test/src/test/ impl-vlt-test/src/test/java/ impl-vlt-test/src/test/java/org/ impl-v
Author: rombert Date: Mon Sep 9 14:44:09 2013 New Revision: 1521146 URL: http://svn.apache.org/r1521146 Log: SLING-2989 - [Tooling] integrate with vlt once available Implement serialization of Java primitive types from .content.xml files into the repository. Not yet implemented: Name, Path, Reference and WeakReference. Added: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/pom.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multiple-properties-connect.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/name-content.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/path-content.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/reference-content.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/simple-content.xml (with props) sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java (with props) Removed: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContextXmlHandler.java Modified: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/META-INF/MANIFEST.MF sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java sling/branches/tooling-ide-vlt/tooling/ide/pom.xml sling/branches/tooling-ide-vlt/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF Added: sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/pom.xml URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/pom.xml?rev=1521146view=auto == --- sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/pom.xml (added) +++ sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/pom.xml Mon Sep 9 14:44:09 2013 @@ -0,0 +1,64 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.sling.ide/groupId +artifactIdreactor/artifactId +version0.0.1-SNAPSHOT/version + /parent + artifactIdorg.apache.sling.ide.impl-vlt-test/artifactId + nameSling IDE Tools: FileVault Implementation Tests/name + dependencies + dependency + groupIdjunit/groupId + artifactIdjunit/artifactId
svn commit: r1521147 - in /sling/branches/tooling-ide-vlt/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ impl-vlt-test/src/test/resources/org/apache/sling/ide/im
Author: rombert
Date: Mon Sep 9 14:44:24 2013
New Revision: 1521147
URL: http://svn.apache.org/r1521147
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Support sync of multi-valued properties to the repository. As before,
Name, Path, Reference and WeakReference property types are not
supported.
Added:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multivalued-properties-content.xml
(with props)
Removed:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/multiple-properties-connect.xml
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/ConversionUtils.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1521147r1=1521146r2=1521147view=diff
==
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
Mon Sep 9 14:44:24 2013
@@ -17,8 +17,8 @@
package org.apache.sling.ide.impl.vlt.serialization;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.array;
import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import java.io.IOException;
@@ -30,6 +30,10 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+import org.hamcrest.TypeSafeMatcher;
import org.junit.Ignore;
import org.junit.Test;
import org.xml.sax.InputSource;
@@ -49,13 +53,11 @@ public class ContentXmlHandlerTest {
assertThat(properties[indexed], properties, hasEntry(indexed,
(Object) Boolean.TRUE));
assertThat(properties[indexRatio], properties,
hasEntry(indexRatio, (Object) Double.valueOf(2.54)));
assertThat(properties[indexDuration], properties,
hasEntry(indexDuration, (Object) BigDecimal.valueOf(500)));
-assertThat(properties[lastIndexTime], properties,
hasEntry(is(lastIndexTime), notNullValue()));
+assertThat(properties[lastIndexTime], (Calendar)
properties.get(lastIndexTime),
+is(millis(137829240l)));
assertThat(properties[lastIndexId], properties,
hasEntry(lastIndexId, (Object)
Long.valueOf(729312000l)));
-Calendar lastIndexTime = (Calendar) properties.get(lastIndexTime);
-assertThat(lastIndexTime.getTimeInMillis(), is(137829240l));
-
}
private MapString, Object parseContentXmlFile(String fileName) throws
ParserConfigurationException, SAXException,
@@ -99,4 +101,50 @@ public class ContentXmlHandlerTest {
assertThat(properties.size, properties.size(), is(3));
}
+
+@Test
+@SuppressWarnings(unchecked)
+public void parseMultiValuedProperties() throws
ParserConfigurationException, SAXException, IOException {
+
+MapString, Object properties =
parseContentXmlFile(multivalued-properties-content.xml);
+
+assertThat(properties.size, properties.size(), is(7));
+assertThat(properties[values], (String[]) properties.get(values),
+Matchers.is(new String[] { first, second }));
+assertThat(properties[decimals], (BigDecimal[])
properties.get(decimals),
+Matchers.is(new BigDecimal[] { new BigDecimal(5.10), new
BigDecimal(5.11) }));
+assertThat(properties[doubles], (Double[]) properties.get(doubles),
+Matchers.is(new Double[] { new Double(5.1), new
Double(7.5), new Double(9.0) }));
+assertThat(properties[flags], (Boolean[]) properties.get(flags),
+Matchers.is(new Boolean[] { Boolean.FALSE, Boolean.TRUE }));
+assertThat(properties[longs], (Long[]) properties.get(longs),
+Matchers.is(new Long[] { Long.valueOf(15), Long.valueOf(25)
}));
+assertThat
