svn commit: r1597523 - /sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
Author: stefanegli
Date: Mon May 26 07:32:35 2014
New Revision: 1597523
URL: http://svn.apache.org/r1597523
Log:
no-jira : null pointer check
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java?rev=1597523r1=1597522r2=1597523view=diff
==
---
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
(original)
+++
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/EmbeddedArchetypeInstaller.java
Mon May 26 07:32:35 2014
@@ -88,6 +88,9 @@ public class EmbeddedArchetypeInstaller
}
public void addResource(String fileExtension, URL origin) throws
IOException {
+ if (origin==null) {
+ throw new IllegalArgumentException(origin must not be null);
+ }
origins.put(fileExtension, origin.openStream());
}
svn commit: r1597529 - /sling/trunk/bundles/extensions/serviceusermapper/pom.xml
Author: cziegeler Date: Mon May 26 08:57:18 2014 New Revision: 1597529 URL: http://svn.apache.org/r1597529 Log: [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.0.2 Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1597529r1=1597528r2=1597529view=diff == --- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original) +++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Mon May 26 08:57:18 2014 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.serviceusermapper/artifactId packagingbundle/packaging -version1.0.1-SNAPSHOT/version +version1.0.2/version nameApache Sling Service User Mapper/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.0.2/url /scm build
svn commit: r1597531 - /sling/trunk/bundles/extensions/serviceusermapper/pom.xml
Author: cziegeler Date: Mon May 26 09:00:38 2014 New Revision: 1597531 URL: http://svn.apache.org/r1597531 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1597531r1=1597530r2=1597531view=diff == --- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original) +++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Mon May 26 09:00:38 2014 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.serviceusermapper/artifactId packagingbundle/packaging -version1.0.2/version +version1.0.3-SNAPSHOT/version nameApache Sling Service User Mapper/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.0.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.0.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.0.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/url /scm build
svn commit: r1597530 - /sling/tags/org.apache.sling.serviceusermapper-1.0.2/
Author: cziegeler Date: Mon May 26 09:00:34 2014 New Revision: 1597530 URL: http://svn.apache.org/r1597530 Log: [maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.0.2 Added: sling/tags/org.apache.sling.serviceusermapper-1.0.2/ - copied from r1597529, sling/trunk/bundles/extensions/serviceusermapper/
svn commit: r1597534 - in /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl: ContentDeploymentTest.java ContentImportTest.java JcrFullCoverageAggregatesDeploymentTest.java JcrPa
Author: rombert
Date: Mon May 26 09:18:10 2014
New Revision: 1597534
URL: http://svn.apache.org/r1597534
Log:
SLING-3081 - Do not re-publish modules when starting the launchpad for
the first time
Update all tests to write content after the module is deployed, in
preparation for the main change.
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrPartialCoverageAggregatesDeploymentTest.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java?rev=1597534r1=1597533r2=1597534view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Mon May 26 09:18:10 2014
@@ -33,7 +33,6 @@ import javax.jcr.RepositoryException;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.URIException;
-import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.test.impl.helpers.DisableDebugStatusHandlers;
import org.apache.sling.ide.test.impl.helpers.ExternalSlingLaunchpad;
import org.apache.sling.ide.test.impl.helpers.LaunchpadConfig;
@@ -85,15 +84,15 @@ public class ContentDeploymentTest {
ProjectAdapter project = new ProjectAdapter(contentProject);
project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
-
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.txt),
new ByteArrayInputStream(
-hello, world.getBytes()));
-
// install bundle facet
project.installFacet(sling.content, 1.0);
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.txt),
new ByteArrayInputStream(
+hello, world.getBytes()));
+
// verify that file is created
final RepositoryAccessor repo = new RepositoryAccessor(config);
Poller poller = new Poller();
@@ -142,15 +141,15 @@ public class ContentDeploymentTest {
ProjectAdapter project = new ProjectAdapter(contentProject);
project.addNatures(org.eclipse.wst.common.project.facet.core.nature);
-
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.txt),
-new ByteArrayInputStream(hello, world.getBytes()));
-
// install bundle facet
project.installFacet(sling.content, 1.0);
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.txt),
new ByteArrayInputStream(
+hello, world.getBytes()));
+
// verifications
final RepositoryAccessor repo = new RepositoryAccessor(config);
Poller poller = new Poller();
@@ -176,15 +175,15 @@ public class ContentDeploymentTest {
ProjectAdapter project = new ProjectAdapter(contentProject);
project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
-
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.esp),
new ByteArrayInputStream(
-// not really javascript.getBytes()));
-
// install bundle facet
project.installFacet(sling.content, 1.0);
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.esp),
new ByteArrayInputStream(
+// not really javascript.getBytes()));
+
// verify that file is created
final RepositoryAccessor repo = new RepositoryAccessor(config);
Poller poller = new Poller();
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java?rev=1597534r1=1597533r2=1597534view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
(original)
+++
svn commit: r1597535 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
Author: rombert
Date: Mon May 26 09:19:37 2014
New Revision: 1597535
URL: http://svn.apache.org/r1597535
Log:
Tolerate a project which is not deployed on a repository in
ServerUtil.getDefaultRepository
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java?rev=1597535r1=1597534r2=1597535view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
Mon May 26 09:19:37 2014
@@ -51,10 +51,13 @@ public abstract class ServerUtil {
public static Repository getDefaultRepository(IProject project) {
IServer server = getDefaultServer(project);
+if (server == null) {
+return null;
+}
try {
return getRepository(server, new NullProgressMonitor());
} catch (CoreException e) {
-e.printStackTrace();
+Activator.getDefault().getPluginLogger().warn(Failed getting a
repository for + project, e);
return null;
}
}
svn commit: r1597536 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Mon May 26 09:20:32 2014
New Revision: 1597536
URL: http://svn.apache.org/r1597536
Log:
SLING-3081 - Do not re-publish modules when starting the launchpad for
the first time
Set the module publish state to none even when we ignore the publish
request. This signals that the request has been acknowledged and
possibly acted on. Otherwise, the ignored operations will be resubmitted
for each change.
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=1597536r1=1597535r2=1597536view=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 May 26 09:20:32 2014
@@ -151,11 +151,13 @@ public class SlingLaunchpadBehaviour ext
if ((kind == IServer.PUBLISH_AUTO || kind ==
IServer.PUBLISH_INCREMENTAL)
deltaKind == ServerBehaviourDelegate.NO_CHANGE) {
logger.trace(Ignoring request to publish the module when no
resources have changed; most likely another module has changed);
+setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
return;
}
if (kind == IServer.PUBLISH_FULL deltaKind ==
ServerBehaviourDelegate.REMOVED) {
logger.trace(Ignoring request to unpublish all of the module
resources);
+setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
return;
}
svn commit: r1597537 - in /sling/trunk/tooling/ide: eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java eclipse-test/src/org/apache/sling/ide/test/impl/ContentDepl
Author: rombert
Date: Mon May 26 09:20:56 2014
New Revision: 1597537
URL: http://svn.apache.org/r1597537
Log:
SLING-3081 - Do not re-publish modules when starting the launchpad for
the first time
Prevent full publishing of content modules when first added + add test.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.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=1597537r1=1597536r2=1597537view=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 May 26 09:20:56 2014
@@ -172,6 +172,12 @@ public class SlingLaunchpadBehaviour ext
}
} else if (ProjectHelper.isContentProject(module[0].getProject())) {
+if (kind == IServer.PUBLISH_FULL deltaKind ==
ServerBehaviourDelegate.ADDED) {
+logger.trace(Ignoring request to fully publish an added
content module);
+setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+return;
+}
+
try {
publishContentModule(kind, deltaKind, module, monitor);
BundleStateHelper.resetBundleState(getServer(),
module[0].getProject());
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java?rev=1597537r1=1597536r2=1597537view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Mon May 26 09:20:56 2014
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.util.concurrent.Callable;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import org.apache.commons.httpclient.HttpException;
@@ -195,6 +196,44 @@ public class ContentDeploymentTest {
assertThatNode(repo, poller, /test/hello.esp/jcr:content,
hasPropertyValue(jcr:mimeType, text/javascript));
}
+@Test(expected = PathNotFoundException.class)
+public void deployFileBeforeModuleDeploymentIsIgnored() throws Throwable {
+
+wstServer.waitForServerToStart();
+
+// create faceted project
+IProject contentProject = projectRule.getProject();
+
+ProjectAdapter project = new ProjectAdapter(contentProject);
+project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
+
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/hello.txt),
new ByteArrayInputStream(
+hello, world.getBytes()));
+
+// install bundle facet
+project.installFacet(sling.content, 1.0);
+
+ServerAdapter server = new ServerAdapter(wstServer.getServer());
+server.installModule(contentProject);
+
+// verify that file is created
+final RepositoryAccessor repo = new RepositoryAccessor(config);
+Poller poller = new Poller();
+try {
+poller.pollUntil(new CallableNode() {
+@Override
+public Node call() throws RepositoryException {
+return repo.getNode(/test/hello.txt);
+}
+}, nullValue(Node.class));
+} catch (RuntimeException e) {
+// unwrap the underlying repository exception, since the poller
does not do that
+if (e.getCause() != null)
+throw e.getCause();
+}
+
+}
+
private void assertThatNode(final RepositoryAccessor repo, Poller poller,
final String nodePath, MatcherNode matcher)
throws InterruptedException {
svn commit: r1597540 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Mon May 26 09:35:55 2014 New Revision: 1597540 URL: http://svn.apache.org/r1597540 Log: Use latest snapshot for servicemapper 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=1597540r1=1597539r2=1597540view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon May 26 09:35:55 2014 @@ -185,7 +185,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.serviceusermapper/artifactId -version1.0.1-SNAPSHOT/version +version1.0.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1597565 - in /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl: ContentImportTest.java JcrFullCoverageAggregatesDeploymentTest.java ProjectUtilTest.java filter-only
Author: rombert
Date: Mon May 26 11:41:31 2014
New Revision: 1597565
URL: http://svn.apache.org/r1597565
Log:
SLING-3586 - Publishing content fails if intermediate nodes are not
present in the repository
Added ProjectAdapter.createVltFilterWithRoots
Removed:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/filter-only-content-test-root-en.xml
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ProjectUtilTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ProjectAdapter.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java?rev=1597565r1=1597564r2=1597565view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
Mon May 26 11:41:31 2014
@@ -75,12 +75,10 @@ public class ContentImportTest {
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+project.createVltFilterWithRoots(/content/test-root/en);
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/test-root/en/hello.txt),
new ByteArrayInputStream(hello, world.getBytes()));
-
project.createOrUpdateFile(Path.fromPortableString(META-INF/vault/filter.xml),
getClass()
-.getResourceAsStream(filter-only-content-test-root-en.xml));
-
// create server-side content
RepositoryAccessor repo = new RepositoryAccessor(config);
repo.createNode(/content/test-root/en, nt:folder);
@@ -111,12 +109,10 @@ public class ContentImportTest {
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+project.createVltFilterWithRoots(/content/test-root/en);
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/test-root/en/hello.txt),
new ByteArrayInputStream(hello, world.getBytes()));
-
project.createOrUpdateFile(Path.fromPortableString(META-INF/vault/filter.xml),
getClass()
-.getResourceAsStream(filter-only-content-test-root-en.xml));
-
// create server-side content
RepositoryAccessor repo = new RepositoryAccessor(config);
repo.createNode(/content/test-root/de, nt:folder);
@@ -146,9 +142,7 @@ public class ContentImportTest {
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
-
project.createOrUpdateFile(Path.fromPortableString(META-INF/vault/filter.xml),
getClass()
-.getResourceAsStream(filter-only-content-test-root-en.xml));
-
+project.createVltFilterWithRoots(/content/test-root/en);
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/test-root/.vltignore),
new ByteArrayInputStream(en\n.getBytes()));
@@ -181,12 +175,10 @@ public class ContentImportTest {
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
+project.createVltFilterWithRoots(/content/test-root/en);
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/hello.txt),
new ByteArrayInputStream(
hello, world.getBytes()));
-
project.createOrUpdateFile(Path.fromPortableString(META-INF/vault/filter.xml),
getClass()
-.getResourceAsStream(filter-only-content-test-root-en.xml));
-
project.createOrUpdateFile(Path.fromPortableString(jcr_root/.vltignore), new
ByteArrayInputStream(
content/test-root/en\n.getBytes()));
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java?rev=1597565r1=1597564r2=1597565view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrFullCoverageAggregatesDeploymentTest.java
Mon May 26 11:41:31 2014
@@ -280,9 +280,7 @@ public class
svn commit: r1597566 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Author: rombert
Date: Mon May 26 11:41:45 2014
New Revision: 1597566
URL: http://svn.apache.org/r1597566
Log:
SLING-3586 - Publishing content fails if intermediate nodes are not
present in the repository
Added a disabled test
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java?rev=1597566r1=1597565r2=1597566view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Mon May 26 11:41:45 2014
@@ -49,6 +49,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.JavaCore;
import org.hamcrest.Matcher;
import org.junit.After;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -234,6 +235,41 @@ public class ContentDeploymentTest {
}
+@Test
+@Ignore(SLING-3586)
+public void deployFileWithMissingParentFromRepository() throws Exception {
+
+wstServer.waitForServerToStart();
+
+// create faceted project
+IProject contentProject = projectRule.getProject();
+
+ProjectAdapter project = new ProjectAdapter(contentProject);
+project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
+
+// install bundle facet
+project.installFacet(sling.content, 1.0);
+
+ServerAdapter server = new ServerAdapter(wstServer.getServer());
+server.installModule(contentProject);
+
+// create filter.xml
+project.createVltFilterWithRoots(/test/demo/nested/structure);
+// create file
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/demo/nested/structure/hello.txt),
+new ByteArrayInputStream(hello, world.getBytes()));
+
+// verify that file is created
+final RepositoryAccessor repo = new RepositoryAccessor(config);
+Poller poller = new Poller();
+poller.pollUntil(new CallableNode() {
+@Override
+public Node call() throws RepositoryException {
+return repo.getNode(/test/demo/nested/structure/hello.txt);
+}
+}, nullValue(Node.class));
+}
+
private void assertThatNode(final RepositoryAccessor repo, Poller poller,
final String nodePath, MatcherNode matcher)
throws InterruptedException {
svn commit: r1597570 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
Author: rombert
Date: Mon May 26 11:55:03 2014
New Revision: 1597570
URL: http://svn.apache.org/r1597570
Log:
Remove tracing call which is problematic at shutdown
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java?rev=1597570r1=1597569r2=1597570view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/JcrContentContentProvider.java
Mon May 26 11:55:03 2014
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
-import org.apache.sling.ide.eclipse.ui.internal.Activator;
import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
import org.apache.sling.ide.eclipse.ui.nav.model.SyncDir;
import org.eclipse.core.resources.IContainer;
@@ -56,8 +55,6 @@ public class JcrContentContentProvider i
@Override
public void resourceChanged(IResourceChangeEvent event) {
if (viewer.getTree().isDisposed()) {
- // then quit here
-
Activator.getDefault().getPluginLogger().trace(JcrContentContentProvider.resourceChanged:
Tree is disposed, quitting.);
return;
}
try {
svn commit: r1597574 - in /sling/trunk/bundles/jcr/it-jackrabbit-oak: pom.xml src/main/resources/
Author: bdelacretaz
Date: Mon May 26 12:27:34 2014
New Revision: 1597574
URL: http://svn.apache.org/r1597574
Log:
Remove empty maven settings file - causes default settings to be ignored
Removed:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/main/resources/
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1597574r1=1597573r2=1597574view=diff
==
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon May 26 12:27:34 2014
@@ -26,7 +26,7 @@
exam.version3.3.0/exam.version
url.version1.5.2/url.version
org.ops4j.pax.logging.DefaultServiceLog.levelWARN/org.ops4j.pax.logging.DefaultServiceLog.level
-
org.ops4j.pax.url.mvn.settings${basedir}/src/main/resources/empty-maven-settings.xml/org.ops4j.pax.url.mvn.settings
+org.ops4j.pax.url.mvn.settings/org.ops4j.pax.url.mvn.settings
oak.version1.0.0/oak.version
sling.oak.server.version${project.version}/sling.oak.server.version
/properties
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-server-definition.png - 48 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-server-definition.png - 66 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide ... The tooling supports content and bundle modules. Content modules typically hold Sling scripts - like JSP and ESP files, client-side resources like CSS and JSS file, but also arbitrary repository content. Content modules support support setting JCR properties for nodes other than nodes and files, based on the FileVault serialization format. You can read mode about FileVault atthe Apache Jackkrabit FileVault docs Bundle modules represent a single OSGi bundle. ... port: used for connecting to the server publishing interval: controls how fast the resources will be published after a change. We recommend setting the interval to 0, for fast deploy times username, password, context path: controls the connection details to the CQ Sling instance. debug port: used for connecting in debug mode Image Removed For working with OSGi bundles, a special support bundle must be installed to support fast bundle redeployment. If it is not present, you can install it using the hyperlink from the Install section. Image Added You can now connect to the server ... Filtering topics - including filter.xml definition Bundle sync The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. Troubleshooting Gathering debug information ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-convert-bundle-dialog.png - 41 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-add-remove-modules.png - 41 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Basic documentation for bundle sync ... The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. To mark a project as being a Sling bundle, right click it in the Project Explorer and Select Configure - Convert to Sling Bundle Project... . A dialog will appear with all the candidate Sling bundle project from the workspace so that you can quickly select multiple projects. Image Added The final step is to open the Servers view and use the Add and Remove... dialog to add the newly created modules to the server. Image Added After OSGi bundle projects are deployed, each change will cause the bundle to be redeployed on the server. Troubleshooting Gathering debug information ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide ... You can now connect to the server Content sync Filtering topics - including filter.xml definition Content projects are required to have at least a jcr_root directory, which contains the serialized content of the repository a META-INF/vault/filter.xml file, which contains the workspace filter definition All changes performed in the local workspace are synchronized to the repository, given that they are included in the workspace filter definition. Converting existing projects To mark a project as being a Sling content module, click it in the Project Explorer and Select Configure - Convert to Sling Content Project... . A dialog will pop up and will ask you to confirm the inferred location of the jcr_root directory. You can also change this from the project properties, the Sling page. filter.xml - workspace filter definition A content project does not synchronize all its contents to the workspace. Instead, it looks for a filter.xml file which defines which content is included in synchronization operations. More information about the filter.xml file format and semantics can be found at FileVault docs - Workspace Filter Bundle sync The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. Converting existing projects To mark a project as being a Sling bundle module, right click it in the Project Explorer and Select Configure - Convert to Sling Bundle Project... . A dialog will appear with all the candidate Sling bundle project from the workspace so that you can quickly select multiple projects. ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r1597582 - in /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui: actions/ nav/model/
Author: stefanegli
Date: Mon May 26 13:38:24 2014
New Revision: 1597582
URL: http://svn.apache.org/r1597582
Log:
SLING-3238 : support all variants of nodes' deletion and remaming
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java?rev=1597582r1=1597581r2=1597582view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
Mon May 26 13:38:24 2014
@@ -52,7 +52,7 @@ public class JcrNodeDeleteAction impleme
if (this.node==null) {
return;
}
- if (!MessageDialog.openConfirm(shell, Delete JCR node, Do
you really want to delete '+node.getName()+'?)) {
+ if (!MessageDialog.openConfirm(shell, Delete JCR node, Do
you really want to delete '+node.getLabel()+'?)) {
return;
}
node.delete();
@@ -71,7 +71,7 @@ public class JcrNodeDeleteAction impleme
Object element = iss.getFirstElement();
if (element instanceof JcrNode) {
final JcrNode n = (JcrNode)element;
- if (n.canBeRenamed()) {
+ if (n.canBeDeleted()) {
action.setEnabled(true);
this.node = n;
return;
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java?rev=1597582r1=1597581r2=1597582view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
Mon May 26 13:38:24 2014
@@ -52,7 +52,7 @@ public class JcrNodeRenameAction impleme
return;
}
InputDialog id = new InputDialog(shell, Change JCR node name,
- Enter new name for JCR node
'+node.getDescription()+':, node.getName(), new IInputValidator() {
+ Enter new name for JCR node
'+node.getDescription()+':, node.getLabel(), new IInputValidator() {
@Override
public String isValid(String newText) {
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java?rev=1597582r1=1597581r2=1597582view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
Mon May 26 13:38:24 2014
@@ -132,4 +132,9 @@ public class DirNode extends JcrNode {
return false;
}
+ @Override
+ public boolean canBeDeleted() {
+ return false;
+ }
+
}
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1597582r1=1597581r2=1597582view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-content-browser.png - 12 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide ... To mark a project as being a Sling content module, click it in the Project Explorer and Select Configure - Convert to Sling Content Project... . A dialog will pop up and will ask you to confirm the inferred location of the jcr_root directory. You can also change this from the project properties, the Sling page. Content navigator In the Project Explorer view there is an additional 'jcr_root' contribution to the project. It is denoted by a folder icon with a small web overlay. This contribution provides a logical view over the repository content, taking into account JCR metadata. As such, .content.xml files will be folded into the corresponding node. Image Added Node properties can be edited in a distinct JCR properties view. Image Added filter.xml - workspace filter definition ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-jcr-properties.png - 20 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-new-bundle-project.png - 29 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-select-archetype.png - 30 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-archetype-properties.png - 30 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-tooling-add-to-server-or-create-new.png - 33 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Creating a new bundle project ... The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. Creating a new bundle project Creating a new Sling bundle project is easily done by using the new Sling Bundle Project Wizard. This wizard is only available when the Maven-based integration is installed. To kick off, start by selected File - New - Project and select Sling Bundle Project under the Sling category. Image Added The next page allows you to select the archetype to use. It's recommended to select the latest version of the archetype. Image Added You will be asked to configure the archetype's properties. Image Added Finally, you can select whether to add the project to an existing server or create a new one. Image Added Once you press finish, the project will be created and deployed to the server. Converting existing projects ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-new-content-project.png - 28 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-content-project-location.png - 23 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Creating a new content project ... All changes performed in the local workspace are synchronized to the repository, given that they are included in the workspace filter definition. Creating a new content project Creating a new Sling content project is easily done by using the new Sling Content Project Wizard. To kick off, start by selected File - New - Project and select Sling Content Project under the Sling category. Image Added You will then be asked to name the project and select its location. Image Added Finally, you can select whether to add the project to an existing server or create a new one. Image Added Once you press finish, the project will be created and deployed to the server. Converting existing projects ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Added known issues ... One often-occuring situation is that a Maven project using the maven-scr-plugin generates the descriptors outside of target/classes, typically in target/scr-plugin-generated. To fix this, make sure that you're using the maven-scr-plugin 1.15.0 or newer and that you have not set a custom outputDirectory. Known issues The content sync implementation tries to mimic the FileVault semantics as closely as possible. However, it is possible that some more exotic content structures will not be handled properly. Some of the problems we're are of are: SLING-3586 - Publishing content fails if intermediate nodes are not present in the repository . The workaround is to manually create the missing nodes in the repository . SLING-3591 - Unable to delete all nodes of a full coverage aggregate . The workaround is to manually delete the child nodes . SLING-3573 - Local resources which are no longer present in the repository are not deleted when importing . The workaround is to manually delete the workspace files . View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Service User Mapper 1.0.2Deployer properties:"userAgent" = "Apache-Maven/3.0.5 (Java 1.7.0_55; Mac OS X 10.9.3)""userId" = "cziegeler""ip" = "91.9.72.253"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-sources.jar(SHA1: a6eabdf1efe75e3a6ef7cb5176c97068de1bb8c6)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2.pom.asc(SHA1: 08119944bea70e814eee03502f48269ae7dfad7a)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-source-release.zip.asc(SHA1: ac68fb065c11cbeaeae5b33947b906cd0d870fc9)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2.jar(SHA1: dcda715d20b2e86feb940fffcbc7371d4cc945f7)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-source-release.zip(SHA1: 7ffa610278c20a085d869aaae66458310ab8c609)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2.pom(SHA1: 656becb84b80ea0be65572579ea67c12de98dcac)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-sources.jar.asc(SHA1: d953cc3a1c1152b4ef892371a76020e0ac36c96f)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2.jar.asc(SHA1: 4f4e979f10ebd43f602572446b8295bb7c239207)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-javadoc.jar(SHA1: e5d456f38f11c820a6e46544c4b061b38da572e7)/org/apache/sling/org.apache.sling.serviceusermapper/1.0.2/org.apache.sling.serviceusermapper-1.0.2-javadoc.jar.asc(SHA1: ec0619df8c16ddc584777d338ba63df5fd5e9ca8)Action performed by Carsten Ziegeler (cziegeler)
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Deploying projects on the server ... A content project does not synchronize all its contents to the workspace. Instead, it looks for a filter.xml file which defines which content is included in synchronization operations. More information about the filter.xml file format and semantics can be found at FileVault docs - Workspace Filter Deploying projects on the server To deploy a project on the server, open the Servers view and use the Add and Remove... dialog to add one or more modules. Image Added After content projects are deployed, each change will cause the changed resources to be updated in the repository. Bundle sync The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. ... To mark a project as being a Sling bundle module, right click it in the Project Explorer and Select Configure - Convert to Sling Bundle Project... . A dialog will appear with all the candidate Sling bundle project from the workspace so that you can quickly select multiple projects. The final step is to Deploying projects on the server To deploy a project on the server, open the Servers view and use the Add and Remove... dialog to add the newly created modules to the serverone or more modules. After OSGi bundle projects are deployed, each change will cause the bundle to be redeployed on the server. ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-import-dialog.png - 27 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu added a file to the page Sling IDE tooling User Guide sling-ide-export-dialog.png - 21 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide Comment: Manual content sync ... After content projects are deployed, each change will cause the changed resources to be updated in the repository. Manual content sync It is possible to manually import/export content from/to the repository. The precondition is that the content project must be associated with a started Sling launchpad server. The actions are available on the project root, or on any child resource under the jcr_root folder. The export wizard is available under the Sling - Export Content ... action. Image Added The import wizard is available under the Sling - Export Content ... action. Image Added Bundle sync The only requirement for bundle projects is that they are Java projects which generate an exploded OSGi bundle in their output directory. That requires at least a valid OSGi Manifest located in META-INF/MANIFEST.MF, but typically one of more Java classes. Other auxiliary files, such as Declarative Service descriptors, must also be placed under the project's output directory. ... View Online Like View Changes Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r1597605 - /sling/trunk/bundles/jcr/resource/pom.xml
Author: cziegeler Date: Mon May 26 15:20:17 2014 New Revision: 1597605 URL: http://svn.apache.org/r1597605 Log: Use Oak 1.0.0 release Modified: sling/trunk/bundles/jcr/resource/pom.xml Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1597605r1=1597604r2=1597605view=diff == --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Mon May 26 15:20:17 2014 @@ -207,7 +207,7 @@ dependency groupIdorg.apache.jackrabbit/groupId artifactIdoak-core/artifactId -version0.19/version +version1.0.0/version scopeprovided/scope /dependency @@ -253,7 +253,7 @@ dependency groupIdorg.apache.jackrabbit/groupId artifactIdoak-jcr/artifactId -version0.19/version +version1.0.0/version scopetest/scope /dependency
