svn commit: r1606657 - /sling/trunk/bundles/scripting/javascript/pom.xml

2014-06-30 Thread olli
Author: olli
Date: Mon Jun 30 09:50:26 2014
New Revision: 1606657

URL: http://svn.apache.org/r1606657
Log:
SLING-3711 fix version range for packages in javax.jcr

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1606657r1=1606656r2=1606657view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Mon Jun 30 09:50:26 2014
@@ -52,6 +52,10 @@
 extensionstrue/extensions
 configuration
 instructions
+Import-Package
+  javax.jcr.*;version=1.0,
+  *
+/Import-Package
 Export-Package
 org.apache.sling.scripting.javascript,
 org.mozilla.javascript;




svn commit: r1606712 - in /sling/trunk/bundles/resourceresolver/src: main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java test/java/org/apache/sling/resourceresolver/impl/mapping/M

2014-06-30 Thread asanso
Author: asanso
Date: Mon Jun 30 12:34:52 2014
New Revision: 1606712

URL: http://svn.apache.org/r1606712
Log:
SLING-3712 - Increase code coverage for MapEntries

Modified:

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java

sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1606712r1=1606711r2=1606712view=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 Mon Jun 30 12:34:52 2014
@@ -548,7 +548,6 @@ public class MapEntries implements Event
 
 // -- internal
 
-//TODO add unit test
 private String getActualContentPath(String path){
 final String checkPath;
 if ( path.endsWith(/jcr:content) ) {
@@ -559,7 +558,6 @@ public class MapEntries implements Event
 return checkPath;
 }
 
-//TODO add unit test
 private String getMapEntryRedirect(MapEntry mapEntry) {
 String[] redirect = mapEntry.getRedirect();
 if (redirect.length  1) {

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java?rev=1606712r1=1606711r2=1606712view=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java
 Mon Jun 30 12:34:52 2014
@@ -25,6 +25,7 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -293,4 +294,36 @@ public class MapEntriesTest {
 assertTrue(resultSet.remove(entry.getRedirect()[0]));
 }
 }
+
+@Test
+public void test_getActualContentPath() throws Exception {
+
+Method method = 
MapEntries.class.getDeclaredMethod(getActualContentPath, String.class);
+method.setAccessible(true);
+
+String actualContent = (String) method.invoke(mapEntries, /content);
+assertEquals(/content, actualContent);
+
+actualContent = (String) method.invoke(mapEntries, 
/content/jcr:content);
+assertEquals(/content, actualContent);
+}
+
+@Test
+public void test_getMapEntryRedirect() throws Exception {
+
+Method method = 
MapEntries.class.getDeclaredMethod(getMapEntryRedirect, MapEntry.class);
+method.setAccessible(true);
+
+MapEntry mapEntry = new MapEntry(/content, -1, false, 0, 
/content); 
+String actualContent = (String) method.invoke(mapEntries, mapEntry);
+assertEquals(/content, actualContent);
+
+mapEntry = new MapEntry(/content, -1, false, 0, /content$1); 
+actualContent = (String) method.invoke(mapEntries, mapEntry);
+assertEquals(/content, actualContent);
+
+mapEntry = new MapEntry(/content, -1, false, 0, /content.html);
 
+actualContent = (String) method.invoke(mapEntries, mapEntry);
+assertEquals(/content, actualContent);
+}
 }




svn commit: r1606721 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:10:54 2014
New Revision: 1606721

URL: http://svn.apache.org/r1606721
Log:
Use latest snapshot for the resourceresolver 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=1606721r1=1606720r2=1606721view=diff
==
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Jun 30 13:10:54 
2014
@@ -190,7 +190,7 @@
 bundle
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.resourceresolver/artifactId
-version1.1.0/version
+version1.1.1-SNAPSHOT/version
 /bundle
 bundle
 groupIdorg.apache.sling/groupId




svn commit: r1606735 - /sling/trunk/tooling/ide/pom.xml

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:43:32 2014
New Revision: 1606735

URL: http://svn.apache.org/r1606735
Log:
SLING-3685 - Document and further automate the IDE tooling release
process

Move the eclipse-test plugin to a profile named 'eclipse-test', active
by default. This will allow the module to be excluded on-demand from the
reactor, as with Tycho 0.20.0 the maven-source-plugin and the
tycho-p2-plugin don't play nice in the same reactor build.

See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=398061 .

Modified:
sling/trunk/tooling/ide/pom.xml

Modified: sling/trunk/tooling/ide/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1606735r1=1606734r2=1606735view=diff
==
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Mon Jun 30 13:43:32 2014
@@ -49,7 +49,6 @@
moduleimpl-vlt-test/module
moduleeclipse-core/module
moduleeclipse-ui/module
-   moduleeclipse-test/module
modulefeature/module
moduleeclipse-m2e-ui/module
moduleeclipse-m2e-test/module
@@ -117,6 +116,9 @@
 
 !-- test data --
 exclude**/*.binary/exclude
+
+!-- prevent failures when eclipse-test is not 
activated as a submodule --
+excludeeclipse-test/**/exclude
 /excludes
 /configuration
 executions
@@ -232,6 +234,15 @@
 /plugins
 /build
 /profile
+profile
+ideclipse-test/id
+activation
+activeByDefaulttrue/activeByDefault
+/activation
+modules
+moduleeclipse-test/module
+/modules
+/profile
 !-- adapted from 
https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/pom.xml --
 profile
 idsource-release/id




svn commit: r1606733 - /sling/trunk/tooling/ide/pom.xml

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:43:20 2014
New Revision: 1606733

URL: http://svn.apache.org/r1606733
Log:
SLING-3685 - Document and further automate the IDE tooling release
process

Run the maven-gpg-plugin when the sign profile is activated.

Modified:
sling/trunk/tooling/ide/pom.xml

Modified: sling/trunk/tooling/ide/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1606733r1=1606732r2=1606733view=diff
==
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Mon Jun 30 13:43:20 2014
@@ -214,6 +214,21 @@
 /execution
 /executions
 /plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-gpg-plugin/artifactId
+configuration
+passphrase${gpg.passphrase}/passphrase
+useAgent${gpg.useagent}/useAgent
+/configuration
+executions
+execution
+goals
+goalsign/goal
+/goals
+/execution
+/executions
+/plugin
 /plugins
 /build
 /profile




svn commit: r1606737 - in /sling/trunk/tooling/ide: ./ api/ artifacts/ eclipse-core/ eclipse-m2e-test/ eclipse-m2e-ui/ eclipse-ui/ feature/ impl-resource/ impl-vlt/ m2e-feature/ p2update/ target-defin

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:43:56 2014
New Revision: 1606737

URL: http://svn.apache.org/r1606737
Log:
SLING-3685 - Document and further automate the IDE tooling release
process

Execute the maven-source-plugin during the 'sign' profile, and make sure
that the proper artifacts are included:

- include Eclipse plug-in specific artifacts in the output by making
them part of the Maven resources
- use the custom MANIFEST.MF whenever present

Modified:
sling/trunk/tooling/ide/api/pom.xml
sling/trunk/tooling/ide/artifacts/pom.xml
sling/trunk/tooling/ide/eclipse-core/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml
sling/trunk/tooling/ide/eclipse-ui/pom.xml
sling/trunk/tooling/ide/feature/pom.xml
sling/trunk/tooling/ide/impl-resource/pom.xml
sling/trunk/tooling/ide/impl-vlt/pom.xml
sling/trunk/tooling/ide/m2e-feature/pom.xml
sling/trunk/tooling/ide/p2update/pom.xml
sling/trunk/tooling/ide/pom.xml
sling/trunk/tooling/ide/target-definition/pom.xml
sling/trunk/tooling/ide/vlt-wrapper/pom.xml

Modified: sling/trunk/tooling/ide/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1606737r1=1606736r2=1606737view=diff
==
--- sling/trunk/tooling/ide/api/pom.xml (original)
+++ sling/trunk/tooling/ide/api/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,29 @@
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/api/developerConnection
 urlhttp://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/url
   /scm
+  
+  build
+!-- ensure that extra files are picked up by the maven-source-plugin --
+resources
+resource
+directory./directory
+includes
+includebuild.properties/include
+includeMETA-INF/*/include
+includeOSGI-INF/*/include
+/includes
+/resource
+/resources
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-source-plugin/artifactId
+configuration
+archive
+manifestFileMETA-INF/MANIFEST.MF/manifestFile
+/archive
+/configuration
+/plugin
+/plugins
+  /build
 /project

Modified: sling/trunk/tooling/ide/artifacts/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/pom.xml?rev=1606737r1=1606736r2=1606737view=diff
==
--- sling/trunk/tooling/ide/artifacts/pom.xml (original)
+++ sling/trunk/tooling/ide/artifacts/pom.xml Mon Jun 30 13:43:56 2014
@@ -35,9 +35,29 @@
 /scm
 
 build
+!-- ensure that extra files are picked up by the maven-source-plugin 
--
+resources
+resource
+directory./directory
+includes
+includebuild.properties/include
+includeMETA-INF/*/include
+includeOSGI-INF/*/include
+/includes
+/resource
+/resources
 plugins
 plugin
 groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-source-plugin/artifactId
+configuration
+archive
+manifestFileMETA-INF/MANIFEST.MF/manifestFile
+/archive
+/configuration
+/plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-dependency-plugin/artifactId
 version2.8/version
 executions

Modified: sling/trunk/tooling/ide/eclipse-core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/pom.xml?rev=1606737r1=1606736r2=1606737view=diff
==
--- sling/trunk/tooling/ide/eclipse-core/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/pom.xml Mon Jun 30 13:43:56 2014
@@ -32,4 +32,30 @@
 
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/ide/eclipse-core/developerConnection
 
urlhttp://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/url
   /scm
+  
+  build
+!-- ensure that extra files are picked up by the maven-source-plugin --
+resources
+resource
+directory./directory
+includes
+includebuild.properties/include
+include.options/include
+includeplugin.xml/include
+includeMETA-INF/*/include
+/includes
+/resource
+/resources
+plugins
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-source-plugin/artifactId
+ 

svn commit: r1606738 - in /sling/trunk/tooling/ide: ./ api-test/ api/ api/META-INF/ artifacts/ artifacts/META-INF/ eclipse-core/ eclipse-core/META-INF/ eclipse-m2e-test/ eclipse-m2e-test/META-INF/ ecl

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:44:42 2014
New Revision: 1606738

URL: http://svn.apache.org/r1606738
Log:
Revert version back to 1.0.0, in preparation for a new release vote

Modified:
sling/trunk/tooling/ide/api-test/pom.xml
sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/api/pom.xml
sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/artifacts/pom.xml
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-test/pom.xml
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/pom.xml
sling/trunk/tooling/ide/feature/feature.xml
sling/trunk/tooling/ide/feature/pom.xml
sling/trunk/tooling/ide/impl-resource-test/pom.xml
sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-resource/pom.xml
sling/trunk/tooling/ide/impl-vlt-test/pom.xml
sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-vlt/pom.xml
sling/trunk/tooling/ide/m2e-feature/feature.xml
sling/trunk/tooling/ide/m2e-feature/pom.xml
sling/trunk/tooling/ide/p2update/pom.xml
sling/trunk/tooling/ide/pom.xml
sling/trunk/tooling/ide/target-definition/pom.xml
sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/vlt-wrapper/pom.xml

Modified: sling/trunk/tooling/ide/api-test/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api-test/pom.xml?rev=1606738r1=1606737r2=1606738view=diff
==
--- sling/trunk/tooling/ide/api-test/pom.xml (original)
+++ sling/trunk/tooling/ide/api-test/pom.xml Mon Jun 30 13:44:42 2014
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.sling.ide/groupId
 artifactIdreactor/artifactId
-version1.0.2-SNAPSHOT/version
+version1.0.0-SNAPSHOT/version
   /parent
   artifactIdorg.apache.sling.ide.api-test/artifactId
   nameSling IDE Tools: API Tests/name

Modified: sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF?rev=1606738r1=1606737r2=1606738view=diff
==
--- sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF Mon Jun 30 13:44:42 2014
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Slingclipse-api
 Bundle-SymbolicName: org.apache.sling.ide.api
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.apache.sling.ide.filter,

Modified: sling/trunk/tooling/ide/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1606738r1=1606737r2=1606738view=diff
==
--- sling/trunk/tooling/ide/api/pom.xml (original)
+++ sling/trunk/tooling/ide/api/pom.xml Mon Jun 30 13:44:42 2014
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.sling.ide/groupId
 artifactIdreactor/artifactId
-version1.0.2-SNAPSHOT/version
+version1.0.0-SNAPSHOT/version
   /parent
   artifactIdorg.apache.sling.ide.api/artifactId
   packagingeclipse-plugin/packaging

Modified: sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF?rev=1606738r1=1606737r2=1606738view=diff
==
--- sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF Mon Jun 30 13:44:42 
2014
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.apache.sling.ide.artifacts
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component,

Modified: sling/trunk/tooling/ide/artifacts/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/pom.xml?rev=1606738r1=1606737r2=1606738view=diff
==
--- sling/trunk/tooling/ide/artifacts/pom.xml (original)
+++ sling/trunk/tooling/ide/artifacts/pom.xml Mon Jun 30 13:44:42 2014
@@ -22,7 +22,7 @@
 parent
 groupIdorg.apache.sling.ide/groupId
 

svn commit: r1606739 - in /sling/trunk/tooling/ide: assembly.xml pom.xml

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:45:31 2014
New Revision: 1606739

URL: http://svn.apache.org/r1606739
Log:
SLING-3685 - Document and further automate the IDE tooling release
process

Remove the source-release profile, as it is no longer used.

Removed:
sling/trunk/tooling/ide/assembly.xml
Modified:
sling/trunk/tooling/ide/pom.xml

Modified: sling/trunk/tooling/ide/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1606739r1=1606738r2=1606739view=diff
==
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Mon Jun 30 13:45:31 2014
@@ -262,79 +262,5 @@
 moduleeclipse-test/module
 /modules
 /profile
-!-- adapted from 
https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/pom.xml --
-profile
-idsource-release/id
-build
-plugins
-plugin
-artifactIdmaven-assembly-plugin/artifactId
-configuration
-
finalNamesling-ide-tooling-${project.version}/finalName
-descriptors
-descriptorassembly.xml/descriptor
-/descriptors
-/configuration
-/plugin
-!-- JCR-2455: Automatic staging of non-Maven release 
artifacts --
-plugin
-artifactIdmaven-antrun-plugin/artifactId
-configuration
-target
-checksum 
file=${basedir}/target/sling-ide-tooling-${project.version}-src.zip 
algorithm=MD5 fileext=.md5/
-checksum 
file=${basedir}/target/sling-ide-tooling-${project.version}-src.zip 
algorithm=SHA1 fileext=.sha/
-checksum 
file=${basedir}/target/sling-ide-tooling-${project.version}-src.zip 
algorithm=SHA1 property=checksum /
-echo file=${basedir}/target/vote.txt
-From: ${username}@apache.org
-To: d...@sling.apache.org
-Subject: [VOTE] Release Apache Sling IDE Tooling ${project.version}
-
-Hi,
-
-We solved ${jira.fixedIssues} issues in this release:
-https://issues.apache.org/jira/browse/SLING/fixforversion/${jira.fixVersion}
-
-There are still some outstanding issues:
-https://issues.apache.org/jira/browse/SLING/component/12320908
-
-The release candidate has been uploaded at 
https://dist.apache.org/repos/dist/dev/sling,
-and can be built using
-
-mvn clean package
-
-The resulting binaries can be installed into an Eclipse instance by installing 
from the update site which is found at p2update/target/repository after 
building the project. 
-
-Please vote to approve this release:
-
-  [ ] +1 Approve the release
-  [ ]  0 Don't care
-  [ ] -1 Don't release, because ...
-
-This majority vote is open for at least 72 hours.
-/echo
-echo /
-echo
-The release candidate has been prepared in:
-
-${basedir}/target/
-
-A release vote template has been generated for you:
-
-file://${basedir}/target/vote.txt
-/echo
-echo /
-/target
-/configuration
-dependencies
-dependency
-groupIdorg.apache.ant/groupId
-artifactIdant-nodeps/artifactId
-version1.8.1/version
-/dependency
-/dependencies
-/plugin
-/plugins
-/build
-/profile
 /profiles
 /project




svn commit: r1606732 - /sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:43:06 2014
New Revision: 1606732

URL: http://svn.apache.org/r1606732
Log:
Added javadoc for ResourceProxy

Modified:

sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java

Modified: 
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java?rev=1606732r1=1606731r2=1606732view=diff
==
--- 
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java
 (original)
+++ 
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/ResourceProxy.java
 Mon Jun 30 13:43:06 2014
@@ -21,6 +21,24 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * The ttResourceProxy/tt is a representation of a resource as found in 
the local workspace
+ * 
+ * p
+ * The resource usually has properties, as returned from tt{@link 
#getProperties()}/tt. If no properties are found,
+ * it means that the resource is only a reference and not that it is an empty 
resource.
+ * /p
+ * 
+ * p
+ * The resource only has information about the first row of children, as 
returned by {@link #getChildren()}. It does not
+ * necessarily know about second-level children.
+ * /p
+ * 
+ * p
+ * By exception, if the child is ttcovered/tt, then all information about 
that child and its descendants is known.
+ * /p
+ *
+ */
 public class ResourceProxy {
 
 private final String path;




svn commit: r1606742 - /sling/tags/sling-ide-tooling-1.0.0/

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 13:57:39 2014
New Revision: 1606742

URL: http://svn.apache.org/r1606742
Log:
Removed sling-ide-tooling 1.0.0, in preparation for re-staging

Removed:
sling/tags/sling-ide-tooling-1.0.0/



svn commit: r1606745 - /sling/tags/sling-ide-tooling-1.0.0/

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 14:06:00 2014
New Revision: 1606745

URL: http://svn.apache.org/r1606745
Log:
Release sling-ide-tooling 1.0.0

Added:
sling/tags/sling-ide-tooling-1.0.0/   (props changed)
  - copied from r1606744, sling/trunk/tooling/ide/

Propchange: sling/tags/sling-ide-tooling-1.0.0/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 14:06:00 2014
@@ -0,0 +1,5 @@
+.settings
+.project
+.classpath
+target
+derby.log

Propchange: sling/tags/sling-ide-tooling-1.0.0/
--
svn:mergeinfo = /sling/branches/tooling-ide-vlt/tooling/ide:1514633-1527500




svn commit: r1606746 - /sling/tags/sling-ide-tooling-1.0.0/

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 14:08:03 2014
New Revision: 1606746

URL: http://svn.apache.org/r1606746
Log:
Rolling back release

Removed:
sling/tags/sling-ide-tooling-1.0.0/



svn commit: r1606781 - in /sling/trunk/tooling/ide: ./ api-test/ api/ api/META-INF/ artifacts/ artifacts/META-INF/ eclipse-core/ eclipse-core/META-INF/ eclipse-m2e-test/ eclipse-m2e-test/META-INF/ ecl

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 15:25:45 2014
New Revision: 1606781

URL: http://svn.apache.org/r1606781
Log:
Set version to 1.0.0 in preparation for release

Modified:
sling/trunk/tooling/ide/api-test/pom.xml
sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/api/pom.xml
sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/artifacts/pom.xml
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-test/pom.xml
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/pom.xml
sling/trunk/tooling/ide/feature/feature.xml
sling/trunk/tooling/ide/feature/pom.xml
sling/trunk/tooling/ide/impl-resource-test/pom.xml
sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-resource/pom.xml
sling/trunk/tooling/ide/impl-vlt-test/pom.xml
sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-vlt/pom.xml
sling/trunk/tooling/ide/m2e-feature/feature.xml
sling/trunk/tooling/ide/m2e-feature/pom.xml
sling/trunk/tooling/ide/p2update/pom.xml
sling/trunk/tooling/ide/pom.xml
sling/trunk/tooling/ide/target-definition/pom.xml
sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/vlt-wrapper/pom.xml

Modified: sling/trunk/tooling/ide/api-test/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api-test/pom.xml?rev=1606781r1=1606780r2=1606781view=diff
==
--- sling/trunk/tooling/ide/api-test/pom.xml (original)
+++ sling/trunk/tooling/ide/api-test/pom.xml Mon Jun 30 15:25:45 2014
@@ -19,7 +19,7 @@
   parent
 groupIdorg.apache.sling.ide/groupId
 artifactIdreactor/artifactId
-version1.0.0-SNAPSHOT/version
+version1.0.0/version
   /parent
   artifactIdorg.apache.sling.ide.api-test/artifactId
   nameSling IDE Tools: API Tests/name

Modified: sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF?rev=1606781r1=1606780r2=1606781view=diff
==
--- sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF Mon Jun 30 15:25:45 2014
@@ -2,14 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Slingclipse-api
 Bundle-SymbolicName: org.apache.sling.ide.api
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.apache.sling.ide.filter,
- org.apache.sling.ide.osgi,
- org.apache.sling.ide.serialization,
- org.apache.sling.ide.transport,
- org.apache.sling.ide.util
+Export-Package: org.apache.sling.ide.filter,org.apache.sling.ide.osgi,
+ org.apache.sling.ide.serialization,org.apache.sling.ide.transport,org
+ .apache.sling.ide.util
 Import-Package: javax.jcr.nodetype,
  org.apache.commons.httpclient;version=3.1.0,
  org.apache.commons.httpclient.auth;version=3.1.0,

Modified: sling/trunk/tooling/ide/api/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1606781r1=1606780r2=1606781view=diff
==
--- sling/trunk/tooling/ide/api/pom.xml (original)
+++ sling/trunk/tooling/ide/api/pom.xml Mon Jun 30 15:25:45 2014
@@ -21,7 +21,7 @@
   parent
 groupIdorg.apache.sling.ide/groupId
 artifactIdreactor/artifactId
-version1.0.0-SNAPSHOT/version
+version1.0.0/version
   /parent
   artifactIdorg.apache.sling.ide.api/artifactId
   packagingeclipse-plugin/packaging

Modified: sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF?rev=1606781r1=1606780r2=1606781view=diff
==
--- sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF Mon Jun 30 15:25:45 
2014
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.apache.sling.ide.artifacts
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component,

Modified: sling/trunk/tooling/ide/artifacts/pom.xml
URL: 

Nexus: Staging Repository Dropped

2014-06-30 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.2.2 (Java 1.7.0_51; Linux 3.11.10-11-desktop), Apache-Maven/3.2.2 (Java 1.7.0_51; Linux 3.11.10-11-desktop)""userId" = "rombert""ip" = "193.105.140.131"Details:The orgapachesling-1071 staging repository has been dropped.Action performed by Robert Munteanu (rombert)

Nexus: Staging Completed

2014-06-30 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDescription:IDE Tooling 1.0.0Deployer properties:"userAgent" = "Apache-Maven/3.2.2 (Java 1.7.0_51; Linux 3.11.10-11-desktop), Apache-Maven/3.2.2 (Java 1.7.0_51; Linux 3.11.10-11-desktop)""userId" = "rombert""ip" = "193.105.140.131"Details:The following artifacts have been staged/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0.pom(SHA1: e3dd7c3e0cb2af00de7eec9f3b5410d9314bd3d3)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-p2artifacts.xml.asc(SHA1: 11ef69ebb79759a6af03f1bc69acaee9744384d2)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-p2artifacts.xml(SHA1: 4684c6436ce32b8d07921d246c25b2f47b5578f0)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0.jar.asc(SHA1: d640d17669eeaf471ddb04d7466cba29747d33a3)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-sources.jar(SHA1: 0f064b3576a797a6b771b359d5b6db68e687a92b)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0.pom.asc(SHA1: d94ff67878855d48fba1ba26a23d3257b0b8654e)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-sources.jar.asc(SHA1: 14ec45077d3b74cf021610cbaac1b31591f2f1cd)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-p2metadata.xml(SHA1: 775b8c1765948bb04de0ed34608dd29e25739046)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0.jar(SHA1: 529cb88af0de0106eb8e54981eee52b23db54551)/org/apache/sling/ide/org.apache.sling.ide.m2e-feature/1.0.0/org.apache.sling.ide.m2e-feature-1.0.0-p2metadata.xml.asc(SHA1: 7be379884700d5d3c21e8190cfa96e217aa00da4)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-p2artifacts.xml.asc(SHA1: 80b9b9f667ea9e96bbf7547a2b9abc99f2b6ced8)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0.jar.asc(SHA1: 67275823c6ee9b3da9ede2433db96e866024a115)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0.pom.asc(SHA1: 9ffbe11bfd2e26f449600a86157ff875aa445d75)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-sources.jar.asc(SHA1: b8c8a9c0b2abae9a5b182dd2e4b5d8a704fa6059)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-p2metadata.xml.asc(SHA1: 98374bff56841bb296c11bf456080ea8c3963c7d)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-sources.jar(SHA1: 5204ba2b0e5a09ca8b555dee8b165a4082c994aa)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0.pom(SHA1: 1dab4d1e852aa7a31b16d70e46bdafe0003b4602)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0.jar(SHA1: 173ce6deff7a90e120c8763546c634a9a395ee5c)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-p2metadata.xml(SHA1: 8870a02c24f4011905222a5b6033f9287ed6ac0d)/org/apache/sling/ide/org.apache.sling.ide.api/1.0.0/org.apache.sling.ide.api-1.0.0-p2artifacts.xml(SHA1: 9fc5d32ff9f9cb9dab63253c8b99de5239e01e62)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0-sources.jar(SHA1: b64e4dc21b5924113c4dd987ca80c01717908bbf)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0.target.asc(SHA1: 231a674a2415b8b50db868a5cf9809baf8e1466e)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0.pom(SHA1: 01674334e453523ab49a6760ea4d32835a8fbfcd)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0.pom.asc(SHA1: 71a3769e0563793640a81cdba345af28dd6fb309)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0.target(SHA1: b6720f89075af461468191b0992882110172dcfc)/org/apache/sling/ide/org.apache.sling.ide.target-definition/1.0.0/org.apache.sling.ide.target-definition-1.0.0-sources.jar.asc(SHA1: 2407e12b6e8dd8d34ed663895457943d1830751c)/org/apache/sling/ide/reactor/1.0.0/reactor-1.0.0.pom.asc(SHA1: c5fe9fbc5d5a73775fcc4101cb8f5b8fd356e5f9)/org/apache/sling/ide/reactor/1.0.0/reactor-1.0.0.pom(SHA1: 7558f80af967a37d3adc120b0fb3dc9004dc0b03)/org/apache/sling/ide/org.apache.sling.ide.p2update/1.0.0/org.apache.sling.ide.p2update-1.0.0-p2metadata.xml.asc(SHA1: 40a82550281b8b9cfe9d46d9dcbc0f71bb6fdd55)/org/apache/sling/ide/org.apache.sling.ide.p2update/1.0.0/org.apache.sling.ide.p2update-1.0.0.zip(SHA1: 1a8e6bdd954f39fdc3af43ee6fa5ea61f26c8135)/org/apache/sling/ide/org.apache.sling.ide.p2update/1.0.0/org.apache.sling.ide.p2update-1.0.0-sources.jar.asc(SHA1: 

svn commit: r1606791 - /sling/tags/sling-ide-tooling-1.0.0/

2014-06-30 Thread rombert
Author: rombert
Date: Mon Jun 30 15:41:24 2014
New Revision: 1606791

URL: http://svn.apache.org/r1606791
Log:
Tagged 1.0.0 release

Added:
sling/tags/sling-ide-tooling-1.0.0/   (props changed)
  - copied from r1606781, sling/trunk/tooling/ide/

Propchange: sling/tags/sling-ide-tooling-1.0.0/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 15:41:24 2014
@@ -0,0 +1,5 @@
+.settings
+.project
+.classpath
+target
+derby.log

Propchange: sling/tags/sling-ide-tooling-1.0.0/
--
svn:mergeinfo = /sling/branches/tooling-ide-vlt/tooling/ide:1514633-1527500