svn commit: r1593008 - /sling/trunk/tooling/ide/eclipse-test/pom.xml
Author: rombert
Date: Wed May 7 13:05:26 2014
New Revision: 1593008
URL: http://svn.apache.org/r1593008
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
- update jetty-maven-plugin to 7.6.x, since 6.x is no longer supported
- make sure that sling.home is inside the target directory of the
eclipse-project
Modified:
sling/trunk/tooling/ide/eclipse-test/pom.xml
Modified: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1593008r1=1593007r2=1593008view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Wed May 7 13:05:26 2014
@@ -92,13 +92,13 @@
/plugin
plugin
groupIdorg.mortbay.jetty/groupId
-artifactIdmaven-jetty-plugin/artifactId
-version6.1.26/version
+artifactIdjetty-maven-plugin/artifactId
+version7.6.15.v20140411/version
configuration
-webApp${project.build.directory}/sling.war/webApp
+war${project.build.directory}/sling.war/war
connectors
connector
-
implementation=org.mortbay.jetty.nio.SelectChannelConnector
+
implementation=org.eclipse.jetty.server.nio.SelectChannelConnector
port${http.port}/port
/connector
/connectors
@@ -106,6 +106,13 @@
stopPort${jetty.stop.port}/stopPort
contextPath//contextPath
daemontrue/daemon
+systemProperties
+forcetrue/force
+systemProperty
+nameuser.dir/name
+value${project.build.directory}/value
+/systemProperty
+/systemProperties
/configuration
executions
execution
svn commit: r1594774 - /sling/trunk/contrib/extensions/leak-detector/pom.xml
Author: chetanm Date: Thu May 15 05:58:54 2014 New Revision: 1594774 URL: http://svn.apache.org/r1594774 Log: SLING-3359 - Classloader Leak Detector Console Tab Preparing for release. Fixing the xml formatting Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/leak-detector/pom.xml?rev=1594774r1=1594773r2=1594774view=diff == --- sling/trunk/contrib/extensions/leak-detector/pom.xml (original) +++ sling/trunk/contrib/extensions/leak-detector/pom.xml Thu May 15 05:58:54 2014 @@ -18,8 +18,7 @@ * from Adobe Systems Incorporated. **/ -- -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/maven-v4_0_0.xsd; +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/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion
svn commit: r1593207 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java
Author: cziegeler
Date: Thu May 8 08:52:29 2014
New Revision: 1593207
URL: http://svn.apache.org/r1593207
Log:
Minor optimization of getting property values for a value map implementation
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java?rev=1593207r1=1593206r2=1593207view=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/JcrPropertyMapCacheEntry.java
Thu May 8 08:52:29 2014
@@ -75,9 +75,8 @@ public class JcrPropertyMapCacheEntry {
isMulti = false;
values = new Value[] {prop.getValue()};
}
-Object tmp = JcrResourceUtil.toJavaObject(prop);
if (isDefaultValueCacheable()) {
-this.defaultValue = tmp;
+this.defaultValue = JcrResourceUtil.toJavaObject(prop);
} else {
this.defaultValue = null;
}
@@ -150,6 +149,4 @@ public class JcrPropertyMapCacheEntry {
private boolean isDefaultValueCacheable() throws RepositoryException {
return property.getType() != PropertyType.BINARY;
}
-
-
}
\ No newline at end of file
svn commit: r1593607 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Author: rombert
Date: Fri May 9 19:53:37 2014
New Revision: 1593607
URL: http://svn.apache.org/r1593607
Log:
SLING-3551 - Content sync does not propagate mixin types
Make the Poller propagate the last caught error after a timeout.
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java?rev=1593607r1=1593606r2=1593607view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Fri May 9 19:53:37 2014
@@ -33,6 +33,8 @@ public class Poller {
long cutoff = System.currentTimeMillis() + DEFAULT_POLL_WAIT_MILLIS;
+Error lastError = null;
+
while (true) {
try {
@@ -41,12 +43,19 @@ public class Poller {
} catch (RuntimeException e) {
// skip
} catch (AssertionFailedError e) {
+lastError = e;
// skip
} catch (AssertionError e) {
+lastError = e;
// skip
}
if (System.currentTimeMillis() = cutoff) {
+
+if (lastError != null) {
+throw lastError;
+}
+
throw new AssertionFailedError(Runnable + r + did not
succeed in the allocated
+ DEFAULT_DELAY_MILLIS + ms);
}
svn commit: r1592962 - in /sling/trunk/tooling/ide: ./ eclipse-test/ eclipse-test/META-INF/ eclipse-test/src/ eclipse-test/src/org/ eclipse-test/src/org/apache/ eclipse-test/src/org/apache/sling/ ecli
Author: rombert
Date: Wed May 7 10:35:11 2014
New Revision: 1592962
URL: http://svn.apache.org/r1592962
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Foundational work for integration tests
- added an eclipse-test project
- added utility classes for Eclipse testing
-- SlingWstServer @Rule
-- IStatusIsOk Hamcrest matcher
- a test which validates that a Sling launchpad can be successfully
started.
Added:
sling/trunk/tooling/ide/eclipse-test/
sling/trunk/tooling/ide/eclipse-test/.gitignore
sling/trunk/tooling/ide/eclipse-test/META-INF/
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-test/build.properties (with props)
sling/trunk/tooling/ide/eclipse-test/pom.xml (with props)
sling/trunk/tooling/ide/eclipse-test/src/
sling/trunk/tooling/ide/eclipse-test/src/org/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
(with props)
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/IStatusIsOk.java
(with props)
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/SlingWstServer.java
(with props)
Modified:
sling/trunk/tooling/ide/pom.xml
Added: sling/trunk/tooling/ide/eclipse-test/.gitignore
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/.gitignore?rev=1592962view=auto
==
--- sling/trunk/tooling/ide/eclipse-test/.gitignore (added)
+++ sling/trunk/tooling/ide/eclipse-test/.gitignore Wed May 7 10:35:11 2014
@@ -0,0 +1 @@
+/bin/
Added: sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF?rev=1592962view=auto
==
--- sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF (added)
+++ sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF Wed May 7
10:35:11 2014
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Sling IDE Tools: Eclipse Tests
+Bundle-SymbolicName: org.apache.sling.ide.eclipse-test
+Bundle-Version: 0.0.1.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.wst.server.core,
+ org.apache.sling.ide.eclipse-core,
+ org.eclipse.debug.core
Added: sling/trunk/tooling/ide/eclipse-test/build.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/build.properties?rev=1592962view=auto
==
--- sling/trunk/tooling/ide/eclipse-test/build.properties (added)
+++ sling/trunk/tooling/ide/eclipse-test/build.properties Wed May 7 10:35:11
2014
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Propchange: sling/trunk/tooling/ide/eclipse-test/build.properties
--
svn:eol-style = native
Added: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1592962view=auto
==
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (added)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Wed May 7 10:35:11 2014
@@ -0,0 +1,46 @@
+?xml version=1.0 encoding=UTF-8?
+project
+xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+modelVersion4.0.0/modelVersion
+parent
+groupIdorg.apache.sling.ide/groupId
+artifactIdreactor/artifactId
+version0.0.1-SNAPSHOT/version
+/parent
+artifactIdorg.apache.sling.ide.eclipse-test/artifactId
+packagingeclipse-test-plugin/packaging
+nameSling IDE Tools: Eclipse Tests/name
+
+build
+plugins
+plugin
+groupIdorg.eclipse.tycho/groupId
+artifactIdtycho-surefire-plugin/artifactId
+version${tycho.version}/version
+configuration
+useUIHarnesstrue/useUIHarness
+dependencies
+!-- Pull in all the artifacts we reference from
+the base feature, to be on the safe
svn commit: r1592966 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Author: rombert
Date: Wed May 7 10:36:40 2014
New Revision: 1592966
URL: http://svn.apache.org/r1592966
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Update the ConnectionTest to wait for an externally started launchpad.
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java?rev=1592966r1=1592965r2=1592966view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Wed May 7 10:36:40 2014
@@ -23,12 +23,16 @@ import org.eclipse.debug.core.DebugPlugi
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
import org.osgi.service.prefs.BackingStoreException;
public class ConnectionTest {
+private final SlingWstServer server = new SlingWstServer();
+
@Rule
-public SlingWstServer serverRule = new SlingWstServer();
+public TestRule chain = RuleChain.outerRule(new
ExternalSlingLaunchpad()).around(server);
@Test
public void deployBundleOnServer() throws CoreException,
InterruptedException, BackingStoreException {
@@ -39,6 +43,6 @@ public class ConnectionTest {
debugPrefs.putBoolean(IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS,
false);
debugPrefs.flush();
-serverRule.waitForServerToStart();
+server.waitForServerToStart();
}
}
svn commit: r1594732 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Wed May 14 21:35:45 2014
New Revision: 1594732
URL: http://svn.apache.org/r1594732
Log:
SLING-2651 - Manually trigger sync on files/directories
Limit the usage of WST-specific APIs in the SlingLaunchpadBehaviour as
much as possible. This makes the code clearear and allows it reuse in
different contexts.
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=1594732r1=1594731r2=1594732view=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
Wed May 14 21:35:45 2014
@@ -516,40 +516,46 @@ public class SlingLaunchpadBehaviour ext
private Command? addFileCommand(Repository repository, IModuleResource
resource) throws CoreException,
SerializationException, IOException {
-if (ignoredFileNames.contains(resource.getName())) {
+IResource res = getResource(resource);
+
+if (res == null) {
return null;
}
-FileInfo info = createFileInfo(resource, repository);
+return addFileCommand(repository, res);
+}
-IResource res = getResource(resource);
-if (res == null) {
+private Command? addFileCommand(Repository repository, IResource
resource) throws SerializationException,
+CoreException, IOException {
+
+if (ignoredFileNames.contains(resource.getName())) {
return null;
}
-Object ignoreNextUpdate =
res.getSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE);
+Object ignoreNextUpdate =
resource.getSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE);
if (ignoreNextUpdate != null) {
-res.setSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE, null);
+resource.setSessionProperty(ResourceUtil.QN_IGNORE_NEXT_CHANGE,
null);
return null;
}
-if (res.isTeamPrivateMember(IResource.CHECK_ANCESTORS)) {
-Activator.getDefault().getPluginLogger().trace(Skipping
team-private resource {0}, res);
+if (resource.isTeamPrivateMember(IResource.CHECK_ANCESTORS)) {
+Activator.getDefault().getPluginLogger().trace(Skipping
team-private resource {0}, resource);
return null;
}
+FileInfo info = createFileInfo(resource, repository);
Activator.getDefault().getPluginLogger().trace(For {0} build fileInfo
{1}, resource, info);
if (info == null) {
return null;
}
-File syncDirectoryAsFile =
ProjectUtil.getSyncDirectoryFullPath(res.getProject()).toFile();
-IFolder syncDirectory = ProjectUtil.getSyncDirectory(res.getProject());
+File syncDirectoryAsFile =
ProjectUtil.getSyncDirectoryFullPath(resource.getProject()).toFile();
+IFolder syncDirectory =
ProjectUtil.getSyncDirectory(resource.getProject());
if (serializationManager.isSerializationFile(info.getLocation())) {
InputStream contents = null;
try {
-IFile file = (IFile) resource.getAdapter(IFile.class);
+IFile file = (IFile) resource;
contents = file.getContents();
String resourceLocation =
file.getFullPath().makeRelativeTo(syncDirectory.getFullPath()).toPortableString();
ResourceProxy resourceProxy =
serializationManager.readSerializationData(resourceLocation, contents);
@@ -575,28 +581,18 @@ public class SlingLaunchpadBehaviour ext
e.printStackTrace();
return null;
} finally {
-if (contents != null) {
-contents.close();
-}
+IOUtils.closeQuietly(contents);
}
} else {
-ResourceProxy resourceProxy =
buildResourceProxyForPlainFileOrFolder( resource, syncDirectory);
+ResourceProxy resourceProxy =
buildResourceProxyForPlainFileOrFolder(resource, syncDirectory);
return repository.newAddOrUpdateNodeCommand(info, resourceProxy);
}
}
- private ResourceProxy buildResourceProxyForPlainFileOrFolder(
IModuleResource resource, IFolder syncDirectory)
+private ResourceProxy buildResourceProxyForPlainFileOrFolder(IResource
changedResource, IFolder syncDirectory)
throws IOException, CoreException {
- IFile file = (IFile)
svn commit: r1594735 - in /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal: ImportWizardPage.java SlingLaunchpadCombo.java
Author: rombert
Date: Wed May 14 21:37:42 2014
New Revision: 1594735
URL: http://svn.apache.org/r1594735
Log:
SLING-2651 - Manually trigger sync on files/directories
Added a SlingLaunchpadCombo class to make it simpler to reuse the
functionality in the UI.
Added:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java
(with props)
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java?rev=1594735r1=1594734r2=1594735view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
Wed May 14 21:37:42 2014
@@ -59,7 +59,7 @@ import org.eclipse.wst.server.core.Serve
*/
public class ImportWizardPage extends WizardDataTransferPage {
-private Combo repositoryCombo;
+private SlingLaunchpadCombo repositoryCombo;
private Label importLabel;
private Button containerBrowseButton;
private IProject project;
@@ -132,9 +132,8 @@ public class ImportWizardPage extends Wi
new Label(container, SWT.NONE).setText(Repository: );
-repositoryCombo = new Combo(container, SWT.DROP_DOWN);
-repositoryCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
false));
-repositoryCombo.addSelectionListener(new SelectionListener() {
+repositoryCombo = new SlingLaunchpadCombo(container, project);
+repositoryCombo.getWidget().addSelectionListener(new
SelectionListener() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -148,7 +147,7 @@ public class ImportWizardPage extends Wi
updateWidgetEnablements();
}
});
-updateRepositoryList();
+repositoryCombo.refreshRepositoryList(new NullProgressMonitor());
Composite containerGroup = new Composite(composite, SWT.NONE);
GridLayout layout = new GridLayout();
@@ -210,22 +209,6 @@ public class ImportWizardPage extends Wi
updateWidgetEnablements();
}
- private void updateRepositoryList() {
- repositoryCombo.removeAll();
- ListIServer servers =
SelectionUtils.getServersLinkedToProject(project, new NullProgressMonitor());
-if (servers.size() 1) {
-repositoryCombo.add(); // force selection only if there is more
than one server
-}
-for (IServer server : servers) {
-repositoryCombo.add(server.getId());
-}
-
-if (servers.size() == 1) {
-repositoryCombo.select(0);
-}
- }
-
-
public void handleEvent(Event event) {
if (event.widget == containerBrowseButton) {
handleContainerBrowseButtonPressed();
@@ -276,16 +259,13 @@ public class ImportWizardPage extends Wi
.findMember(result).getProject();
containerNameField.setText(project.getName());
- updateRepositoryList();
+repositoryCombo.refreshRepositoryList(new NullProgressMonitor());
}
}
public IServer getServer() {
-for (IServer server : ServerCore.getServers())
-if (server.getId().equals(repositoryCombo.getText()))
-return server;
-return null;
+return repositoryCombo.getServer();
}
/*
@@ -299,8 +279,8 @@ public class ImportWizardPage extends Wi
// still under construction
return true;
}
-if (this.repositoryCombo == null ||
this.repositoryCombo.getSelectionIndex() == -1) {
-setErrorMessage(Please select a valid index);
+if (this.repositoryCombo == null || this.repositoryCombo.getServer()
== null) {
+setErrorMessage(Please select a Sling launchpad instance);
return false;
}
@@ -386,16 +366,14 @@ public class ImportWizardPage extends Wi
adjustJcrRootText();
adjustJcrRootText.getParent().pack();
}
-if (repositoryCombo.getItemCount() == 0 project != null) {
- setErrorMessage(The selected project is not configured
with/added to any Sling server);
- return false;
-}
-if ((repositoryCombo.getSelectionIndex() == -1) ||
- (repositoryCombo.getText().length() == 0)) {
-
svn commit: r1592988 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: justin Date: Wed May 7 12:24:27 2014 New Revision: 1592988 URL: http://svn.apache.org/r1592988 Log: Sling Models 1.0.4 release Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1592988r1=1592987r2=1592988view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Wed May 7 12:24:27 2014 @@ -94,7 +94,7 @@ Launchpad Integration Tests|org.apache.s Launchpad Testing Services|org.apache.sling.launchpad.test-services|2.0.8 Launchpad Testing Services WAR|org.apache.sling.launchpad.test-services-war|2.0.8||war Models API|org.apache.sling.models.api|1.0.0 -Models Implementation|org.apache.sling.models.impl|1.0.2 +Models Implementation|org.apache.sling.models.impl|1.0.4 Resource Collection|org.apache.sling.resourcecollection|1.0.0 Resource Inventory|org.apache.sling.resource.inventory|1.0.2 Resource Merger|org.apache.sling.resourcemerger|1.1.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1592988r1=1592987r2=1592988view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Wed May 7 12:24:27 2014 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Models Impl 1.0.4 (May 7th, 2014) * New Releases: Apache Sling Discovery Impl 1.0.8, Apache Sling Resource Inventory 1.0.2 and Apache Sling Eventing 3.3.10 (April 30th, 2014) * New Release: Apache Sling Commons ClassLoader 1.3.2 (April 17th, 2014) * New Releases: Apache Sling Resource Resolver 1.1.0, Apache Sling Featureflags 1.0.0, Apache Sling Resource-Based Discovery Service (discovery.impl) 1.0.6 (April 4th, 2014)
svn commit: r1593617 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Author: rombert
Date: Fri May 9 20:58:46 2014
New Revision: 1593617
URL: http://svn.apache.org/r1593617
Log:
SLING-3551 - Content sync does not propagate mixin types
The Poller now propagates the last caught throwable in all situations.
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java?rev=1593617r1=1593616r2=1593617view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/Poller.java
Fri May 9 20:58:46 2014
@@ -33,7 +33,7 @@ public class Poller {
long cutoff = System.currentTimeMillis() + DEFAULT_POLL_WAIT_MILLIS;
-Error lastError = null;
+Throwable lastError = null;
while (true) {
@@ -41,6 +41,7 @@ public class Poller {
r.run();
break;
} catch (RuntimeException e) {
+lastError = e;
// skip
} catch (AssertionFailedError e) {
lastError = e;
@@ -52,8 +53,10 @@ public class Poller {
if (System.currentTimeMillis() = cutoff) {
-if (lastError != null) {
-throw lastError;
+if (lastError instanceof RuntimeException) {
+throw (RuntimeException) lastError;
+} else if (lastError instanceof Error) {
+throw (Error) lastError;
}
throw new AssertionFailedError(Runnable + r + did not
succeed in the allocated
svn commit: r1593044 - in /sling/trunk/tooling/ide/eclipse-test: META-INF/MANIFEST.MF src/org/apache/sling/ide/test/impl/ConnectionTest.java src/org/apache/sling/ide/test/impl/SimpleServlet.java.txt s
Author: rombert
Date: Wed May 7 15:42:07 2014
New Revision: 1593044
URL: http://svn.apache.org/r1593044
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Added a very rough version of a test which verified that a sling bundle
module, once deployed on the server, works as expected.
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/SimpleServlet.java.txt
(with props)
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/SimpleServlet.xml
(with props)
Modified:
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Modified: sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF?rev=1593044r1=1593043r2=1593044view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF Wed May 7
15:42:07 2014
@@ -13,4 +13,8 @@ Require-Bundle: org.junit,
org.apache.sling.ide.eclipse-core,
org.eclipse.debug.core,
org.apache.commons.httpclient,
- org.json
+ org.json,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.maven.runtime,
+ org.apache.commons.io
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java?rev=1593044r1=1593043r2=1593044view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Wed May 7 15:42:07 2014
@@ -16,17 +16,57 @@
*/
package org.apache.sling.ide.test.impl;
+import static org.junit.Assert.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.artifact.Artifact;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+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.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.hamcrest.CoreMatchers;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.osgi.service.prefs.BackingStoreException;
+// http://www.eclipse.org/forums/index.php/t/457988/
+//
https://github.com/jbosstools/jbosstools-server/blob/master/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
+//
https://github.com/jbosstools/jbosstools-server/blob/master/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
+//
https://stackoverflow.com/questions/6660155/eclipse-plugin-java-based-project-how-to
public class ConnectionTest {
private final SlingWstServer server = new SlingWstServer();
@@ -35,7 +75,7 @@ public class ConnectionTest {
public TestRule chain = RuleChain.outerRule(new
ExternalSlingLaunchpad()).around(server);
@Test
-public void deployBundleOnServer() throws CoreException,
InterruptedException, BackingStoreException {
+
svn commit: r1594778 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Author: asanso
Date: Thu May 15 06:06:05 2014
New Revision: 1594778
URL: http://svn.apache.org/r1594778
Log:
SLING-3505 - Improve handling of updates to mapping (alias, vanity path)
* increased code coverage
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java?rev=1594778r1=1594777r2=1594778view=diff
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Thu May 15 06:06:05 2014
@@ -1198,6 +1198,59 @@ public class ResourceResolverTest {
}
}
+@Test public void testResolveRemovedResourceAlias() throws Exception {
+// define an alias for the rootPath
+String alias = testAlias;
+rootNode.setProperty(sling:alias, alias);
+
+saveMappings(session);
+String path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ / + alias + .print.html);
+
+HttpServletRequest request = new FakeSlingHttpServletRequest(path);
+Resource res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertEquals(rootPath, res.getPath());
+assertEquals(rootNode.getPrimaryNodeType().getName(),
+res.getResourceType());
+
+assertEquals(.print.html,
+res.getResourceMetadata().getResolutionPathInfo());
+
+assertNotNull(res.adaptTo(Node.class));
+assertTrue(rootNode.isSame(res.adaptTo(Node.class)));
+
+path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath) + /
++ alias + .print.html/suffix.pdf);
+
+request = new FakeSlingHttpServletRequest(path);
+res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertEquals(rootPath, res.getPath());
+assertEquals(rootNode.getPrimaryNodeType().getName(),
+res.getResourceType());
+
+assertEquals(.print.html/suffix.pdf,
+res.getResourceMetadata().getResolutionPathInfo());
+
+assertNotNull(res.adaptTo(Node.class));
+assertTrue(rootNode.isSame(res.adaptTo(Node.class)));
+
+//remove alias property
+rootNode.getProperty(sling:alias).remove();
+saveMappings(session);
+
+path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ / + alias + .print.html);
+
+request = new FakeSlingHttpServletRequest(path);
+res = resResolver.resolve(request, path);
+
+assertNotNull(res);
+assertTrue(res instanceof NonExistingResource);
+assertEquals(/+alias+.print.html, res.getPath());
+}
+
@Test public void testResolveResourceAliasJcrContent() throws Exception {
// define an alias for the rootPath in the jcr:content child node
String alias = testAlias;
@@ -1346,6 +1399,72 @@ public class ResourceResolverTest {
}
+@Test public void testResolveRemovedesourceAliasJcrContent() throws
Exception {
+// define an alias for the rootPath in the jcr:content child node
+String alias = testAlias;
+Node content = rootNode.addNode(jcr:content, nt:unstructured);
+content.setProperty(sling:alias, alias);
+
+try {
+saveMappings(session);
+String path =
ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ / + alias + .print.html);
+
+HttpServletRequest request = new FakeSlingHttpServletRequest(path);
+Resource res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertEquals(rootPath, res.getPath());
+assertEquals(rootNode.getPrimaryNodeType().getName(),
+res.getResourceType());
+
+assertEquals(.print.html,
+res.getResourceMetadata().getResolutionPathInfo());
+
+assertNotNull(res.adaptTo(Node.class));
+assertTrue(rootNode.isSame(res.adaptTo(Node.class)));
+
+path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath) +
/
++ alias + .print.html/suffix.pdf);
+
+request = new FakeSlingHttpServletRequest(path);
+res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertEquals(rootPath, res.getPath());
+assertEquals(rootNode.getPrimaryNodeType().getName(),
+
Nexus: Staging Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.1.1 (Java 1.6.0_45; Linux 3.8.0-37-generic)""userId" = "chetanm""ip" = "121.242.198.2"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-sources.jar.asc(SHA1: eb68c9cea2a7dd78863afd528f363188a994de15)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-source-release.zip.asc(SHA1: b5df65597f5e7064f8a534bd331741ad6695dfca)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-javadoc.jar.asc(SHA1: 1a3bd7a9df96ef0c2626da55797b9e24d5130ff0)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.pom.asc(SHA1: 36b99bc1c054beab0dd21016ec029dfc90431ec8)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-source-release.zip(SHA1: af6b79a45897239ec9a731a76ad8320f62347afd)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar.asc(SHA1: 8872e6a04f79ac55799715be27bc912db22342a4)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar(SHA1: 8fc27476793be70d9ea4a756f3acd173bc6b51e3)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-sources.jar(SHA1: 4cd7077623ddb523709f07fda536e133b58638cf)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.pom(SHA1: 6ed92f68a8fc434c57113e835a8f0da520a9bf1f)/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0-javadoc.jar(SHA1: d51ba5504d7b4f560c7890579140f2c46438b7ec)Action performed by Chetan Mehrotra (chetanm)
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.1.1 (Java 1.6.0_45; Linux 3.8.0-37-generic)""userId" = "chetanm""ip" = "121.242.198.2"Details:The orgapachesling-1060 staging repository has been dropped.Action performed by Chetan Mehrotra (chetanm)
svn commit: r1594788 - /sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java
Author: chetanm Date: Thu May 15 06:43:56 2014 New Revision: 1594788 URL: http://svn.apache.org/r1594788 Log: SLING-3048 - Filter to populate SLF4J MDC with request details Filter would only be enabled if explicitly configured Modified: sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java Modified: sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java?rev=1594788r1=1594787r2=1594788view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/src/main/java/org/apache/sling/extensions/mdc/internal/MDCInsertingFilter.java Thu May 15 06:43:56 2014 @@ -20,6 +20,7 @@ package org.apache.sling.extensions.mdc. import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Modified; import org.apache.felix.scr.annotations.Property; @@ -52,7 +53,9 @@ import java.util.concurrent.CopyOnWriteA @Service @Component(metatype = true, label=%mdc.label, -description = %mdc.description) +description = %mdc.description, +policy = ConfigurationPolicy.REQUIRE +) @Property(name = pattern,value = /.*, propertyPrivate = true) /** * Filter is based on ch.qos.logback.classic.helpers.MDCInsertingServletFilter
svn commit: r1594789 - /sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
Author: chetanm
Date: Thu May 15 06:54:29 2014
New Revision: 1594789
URL: http://svn.apache.org/r1594789
Log:
SLING-3048 - Filter to populate SLF4J MDC with request details
Creating a default config such that filter gets configured in test
Modified:
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
Modified:
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java?rev=1594789r1=1594788r2=1594789view=diff
==
---
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
(original)
+++
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
Thu May 15 06:54:29 2014
@@ -67,6 +67,11 @@ public class ITMDCFilter {
public boolean isTrue() throws Exception {
RequestBuilder rb = new
RequestBuilder(ServerConfiguration.getServerUrl());
executor.execute(rb.buildGetRequest(/mdc)).assertStatus(200);
+rb = new
RequestBuilder(ServerConfiguration.getServerUrl());
+
+//Create test config via servlet
+executor.execute(rb.buildGetRequest(/mdc,
createTestConfig, true));
+TimeUnit.SECONDS.sleep(1);
return true;
}
},5,100);
svn commit: r1594790 - /sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
Author: chetanm Date: Thu May 15 06:55:16 2014 New Revision: 1594790 URL: http://svn.apache.org/r1594790 Log: [maven-release-plugin] prepare release org.apache.sling.extensions.slf4j.mdc-1.0.0 Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1594790r1=1594789r2=1594790view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Thu May 15 06:55:16 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.extensions.slf4j.mdc/artifactId -version1.0.1-SNAPSHOT/version +version1.0.0/version packagingbundle/packaging nameApache Sling SLF4J MDC Filter/name @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0 /developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/url + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/url /scm properties
svn commit: r1594791 - /sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/slf4j-mdc/
Author: chetanm Date: Thu May 15 06:55:37 2014 New Revision: 1594791 URL: http://svn.apache.org/r1594791 Log: [maven-release-plugin] copy for tag org.apache.sling.extensions.slf4j.mdc-1.0.0 Added: sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/slf4j-mdc/ - copied from r1594790, sling/trunk/contrib/extensions/slf4j-mdc/
svn commit: r1594792 - /sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
Author: chetanm Date: Thu May 15 06:55:42 2014 New Revision: 1594792 URL: http://svn.apache.org/r1594792 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1594792r1=1594791r2=1594792view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Thu May 15 06:55:42 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.extensions.slf4j.mdc/artifactId -version1.0.0/version +version1.0.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling SLF4J MDC Filter/name @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0 + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc /developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/url + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/url /scm properties
svn commit: r1592967 - /sling/trunk/tooling/ide/eclipse-test/pom.xml
Author: rombert
Date: Wed May 7 10:37:01 2014
New Revision: 1592967
URL: http://svn.apache.org/r1592967
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Format pom.xml
Modified:
sling/trunk/tooling/ide/eclipse-test/pom.xml
Modified: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1592967r1=1592966r2=1592967view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Wed May 7 10:37:01 2014
@@ -77,52 +77,53 @@
/execution
/executions
configuration
- artifactItems
-artifactItem
- groupIdorg.apache.sling/groupId
- artifactIdorg.apache.sling.launchpad/artifactId
- version7-SNAPSHOT/version
- typewar/type
- overWritefalse/overWrite
-
outputDirectory${project.build.directory}/outputDirectory
- destFileNamesling.war/destFileName
-/artifactItem
- /artifactItems
-/configuration
+artifactItems
+artifactItem
+groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.launchpad/artifactId
+version7-SNAPSHOT/version
+typewar/type
+overWritefalse/overWrite
+
outputDirectory${project.build.directory}/outputDirectory
+destFileNamesling.war/destFileName
+/artifactItem
+/artifactItems
+/configuration
/plugin
-plugin
-groupIdorg.mortbay.jetty/groupId
-artifactIdmaven-jetty-plugin/artifactId
-version6.1.26/version
-configuration
-webApp${project.build.directory}/sling.war/webApp
-connectors
-connector
implementation=org.mortbay.jetty.nio.SelectChannelConnector
-port${http.port}/port
-/connector
-/connectors
-stopKeySLING_IT_STOP_KEY/stopKey
-stopPort${jetty.stop.port}/stopPort
-contextPath//contextPath
-daemontrue/daemon
-/configuration
-executions
-execution
-idjetty-run/id
-phasepre-integration-test/phase
-goals
-goalrun-war/goal
-/goals
-/execution
-execution
-idjetty-stop/id
-phasepost-integration-test/phase
-goals
-goalstop/goal
-/goals
-/execution
-/executions
-/plugin
-/plugins
+plugin
+groupIdorg.mortbay.jetty/groupId
+artifactIdmaven-jetty-plugin/artifactId
+version6.1.26/version
+configuration
+webApp${project.build.directory}/sling.war/webApp
+connectors
+connector
+
implementation=org.mortbay.jetty.nio.SelectChannelConnector
+port${http.port}/port
+/connector
+/connectors
+stopKeySLING_IT_STOP_KEY/stopKey
+stopPort${jetty.stop.port}/stopPort
+contextPath//contextPath
+daemontrue/daemon
+/configuration
+executions
+execution
+idjetty-run/id
+phasepre-integration-test/phase
+goals
+goalrun-war/goal
+/goals
+/execution
+execution
+idjetty-stop/id
+phasepost-integration-test/phase
+goals
+goalstop/goal
+/goals
+/execution
+/executions
+/plugin
+/plugins
/build
/project
\ No newline at end of file
svn commit: r1593278 - /sling/trunk/tooling/ide/pom.xml
Author: rombert Date: Thu May 8 13:32:41 2014 New Revision: 1593278 URL: http://svn.apache.org/r1593278 Log: Update to tycho 0.20.0. 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=1593278r1=1593277r2=1593278view=diff == --- sling/trunk/tooling/ide/pom.xml (original) +++ sling/trunk/tooling/ide/pom.xml Thu May 8 13:32:41 2014 @@ -67,7 +67,7 @@ /build properties - tycho.version0.18.1/tycho.version + tycho.version0.20.0/tycho.version project.build.sourceEncodingUTF-8/project.build.sourceEncoding /properties /project
svn commit: r1593276 - in /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl: BundleDeploymentTest.java ContentDeploymentTest.java helpers/RepositoryAccessor.java
Author: rombert
Date: Thu May 8 13:31:39 2014
New Revision: 1593276
URL: http://svn.apache.org/r1593276
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance
Centralized repository access login in a RepositoryAccessor helper.
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/RepositoryAccessor.java
(with props)
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
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/BundleDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java?rev=1593276r1=1593275r2=1593276view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
Thu May 8 13:31:39 2014
@@ -16,16 +16,9 @@
*/
package org.apache.sling.ide.test.impl;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.osgi.OsgiClientException;
import org.apache.sling.ide.test.impl.helpers.DisableDebugStatusHandlers;
@@ -35,6 +28,7 @@ import org.apache.sling.ide.test.impl.he
import org.apache.sling.ide.test.impl.helpers.OsgiBundleManifest;
import org.apache.sling.ide.test.impl.helpers.ProjectAdapter;
import org.apache.sling.ide.test.impl.helpers.ServerAdapter;
+import org.apache.sling.ide.test.impl.helpers.RepositoryAccessor;
import org.apache.sling.ide.test.impl.helpers.SlingWstServer;
import org.apache.sling.ide.test.impl.helpers.TemporaryProject;
import org.apache.sling.ide.test.impl.helpers.ToolingSupportBundle;
@@ -124,7 +118,8 @@ public class BundleDeploymentTest {
Thread.sleep(1000); // for good measure, make sure the output is there
- TODO replace with polling
-assertSimpleServletCallsSucceeds(Version 1);
+RepositoryAccessor repo = new RepositoryAccessor(config);
+repo.assertGetIsSuccessful(simple-servlet, Version 1);
// create DS component class
InputStream simpleServlet2 = null;
@@ -137,20 +132,6 @@ public class BundleDeploymentTest {
Thread.sleep(1000); // for good measure, make sure the output is there
- TODO replace with polling
-assertSimpleServletCallsSucceeds(Version 2);
-}
-
-private void assertSimpleServletCallsSucceeds(String expectedOutput)
throws IOException, HttpException, URIException {
-HttpClient c = new HttpClient();
-GetMethod gm = new GetMethod(config.getUrl() + simple-servlet);
-try {
-int status = c.executeMethod(gm);
-
-assertThat(Unexpected status code for + gm.getURI(), status,
equalTo(200));
-assertThat(Unexpected response for + gm.getURI(),
gm.getResponseBodyAsString(), equalTo(expectedOutput));
-
-} finally {
-gm.releaseConnection();
-}
+repo.assertGetIsSuccessful(simple-servlet, Version 2);
}
}
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=1593276r1=1593275r2=1593276view=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
Thu May 8 13:31:39 2014
@@ -16,27 +16,17 @@
*/
package org.apache.sling.ide.test.impl;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import
svn commit: r1594775 - /sling/trunk/contrib/extensions/leak-detector/pom.xml
Author: chetanm Date: Thu May 15 06:02:47 2014 New Revision: 1594775 URL: http://svn.apache.org/r1594775 Log: [maven-release-plugin] prepare release org.apache.sling.extensions.classloader-leak-detector-1.0.0 Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/leak-detector/pom.xml?rev=1594775r1=1594774r2=1594775view=diff == --- sling/trunk/contrib/extensions/leak-detector/pom.xml (original) +++ sling/trunk/contrib/extensions/leak-detector/pom.xml Thu May 15 06:02:47 2014 @@ -30,7 +30,7 @@ artifactIdorg.apache.sling.extensions.classloader-leak-detector/artifactId packagingbundle/packaging - version0.0.1-SNAPSHOT/version + version1.0.0/version nameAdobe Sling ClassLoader Leak Detector/name description @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/leak-detector/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/leak-detector + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0 /developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/leak-detector/url + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/url /scm build
svn commit: r1594776 - /sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/
Author: chetanm Date: Thu May 15 06:03:00 2014 New Revision: 1594776 URL: http://svn.apache.org/r1594776 Log: [maven-release-plugin] copy for tag org.apache.sling.extensions.classloader-leak-detector-1.0.0 Added: sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/ - copied from r1594775, sling/trunk/contrib/extensions/leak-detector/
svn commit: r1594777 - /sling/trunk/contrib/extensions/leak-detector/pom.xml
Author: chetanm Date: Thu May 15 06:03:04 2014 New Revision: 1594777 URL: http://svn.apache.org/r1594777 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml Modified: sling/trunk/contrib/extensions/leak-detector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/leak-detector/pom.xml?rev=1594777r1=1594776r2=1594777view=diff == --- sling/trunk/contrib/extensions/leak-detector/pom.xml (original) +++ sling/trunk/contrib/extensions/leak-detector/pom.xml Thu May 15 06:03:04 2014 @@ -30,7 +30,7 @@ artifactIdorg.apache.sling.extensions.classloader-leak-detector/artifactId packagingbundle/packaging - version1.0.0/version + version1.0.1-SNAPSHOT/version nameAdobe Sling ClassLoader Leak Detector/name description @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0 + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/leak-detector/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/leak-detector /developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.classloader-leak-detector-1.0.0/url + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/leak-detector/url /scm build
svn commit: r1594781 - /sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
Author: chetanm Date: Thu May 15 06:18:20 2014 New Revision: 1594781 URL: http://svn.apache.org/r1594781 Log: [maven-release-plugin] prepare release org.apache.sling.extensions.slf4j.mdc-1.0.0 Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1594781r1=1594780r2=1594781view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Thu May 15 06:18:20 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.extensions.slf4j.mdc/artifactId -version0.0.1-SNAPSHOT/version +version1.0.0/version packagingbundle/packaging nameApache Sling SLF4J MDC Filter/name @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0 /developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/url + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/url /scm properties
svn commit: r1594485 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Author: asanso
Date: Wed May 14 06:55:53 2014
New Revision: 1594485
URL: http://svn.apache.org/r1594485
Log:
SLING-3558 - Updating of sling:VanityPath mixins is ignored by sling resource
resolution
- added show case test (ignored for now)
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java?rev=1594485r1=1594484r2=1594485view=diff
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Wed May 14 06:55:53 2014
@@ -47,6 +47,7 @@ import org.apache.sling.launchpad.testse
import
org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -1396,7 +1397,65 @@ public class ResourceResolverTest {
assertTrue(res instanceof NonExistingResource);
assertEquals(/childVanity.print.html, res.getPath());
}
+
+@Ignore //see SLING-3558
+@Test public void testResolveRemovedMixinVanityPath() throws Exception {
+Node childNode = null;
+
+try {
+//create new child with vanity path without mixin
+childNode = maybeCreateNode(rootNode, rootChild,
nt:unstructured);
+childNode.setProperty(sling:vanityPath, childVanity);
+saveMappings(session);
+
+String path =
ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ /childVanity.print.html);
+HttpServletRequest request = new FakeSlingHttpServletRequest(path);
+Resource res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertTrue(res instanceof NonExistingResource);
+assertEquals(/childVanity.print.html, res.getPath());
+
+//add mixin
+childNode.addMixin(sling:VanityPath);
+saveMappings(session);
+
+path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ /childVanity.print.html);
+request = new FakeSlingHttpServletRequest(path);
+res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertEquals(childNode.getPath(), res.getPath());
+assertEquals(childNode.getPrimaryNodeType().getName(),
+res.getResourceType());
+
+assertEquals(.print.html,
+res.getResourceMetadata().getResolutionPathInfo());
+
+assertNotNull(res.adaptTo(Node.class));
+assertTrue(childNode.isSame(res.adaptTo(Node.class)));
+
+//remove mixin
+childNode.removeMixin(sling:VanityPath);
+saveMappings(session);
+
+path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath)
++ /childVanity.print.html);
+request = new FakeSlingHttpServletRequest(path);
+res = resResolver.resolve(request, path);
+assertNotNull(res);
+assertTrue(res instanceof NonExistingResource);
+assertEquals(/childVanity.print.html, res.getPath());
+} finally {
+if (childNode != null){
+childNode.remove();
+saveMappings(session);
+}
+}
+}
+
+
@Test public void testGetDoesNotGoUp() throws Exception {
final String path = rootPath + /nothing;
svn commit: r1594780 - /sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
Author: chetanm Date: Thu May 15 06:15:36 2014 New Revision: 1594780 URL: http://svn.apache.org/r1594780 Log: SLING-3048 - Filter to populate SLF4J MDC with request details Preparing for release. Fixing the xml formatting and adding scm information Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1594780r1=1594779r2=1594780view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Thu May 15 06:15:36 2014 @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. -- -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/maven-v4_0_0.xsd; +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/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent @@ -38,6 +37,13 @@ from requests and adds them to the MDC /description + scm + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc +/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/url + /scm + properties pax-exam.version3.0.0/pax-exam.version bundle.build.name
svn commit: r1594783 - /sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
Author: chetanm Date: Thu May 15 06:18:39 2014 New Revision: 1594783 URL: http://svn.apache.org/r1594783 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1594783r1=1594782r2=1594783view=diff == --- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original) +++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Thu May 15 06:18:39 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.extensions.slf4j.mdc/artifactId -version1.0.0/version +version1.0.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling SLF4J MDC Filter/name @@ -38,10 +38,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0 + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/slf4j-mdc /developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/url + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/url /scm properties
svn commit: r1594782 - /sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/
Author: chetanm Date: Thu May 15 06:18:34 2014 New Revision: 1594782 URL: http://svn.apache.org/r1594782 Log: [maven-release-plugin] copy for tag org.apache.sling.extensions.slf4j.mdc-1.0.0 Added: sling/tags/org.apache.sling.extensions.slf4j.mdc-1.0.0/ - copied from r1594781, sling/trunk/contrib/extensions/slf4j-mdc/
svn commit: r1594750 - in /sling/trunk/tooling/ide: eclipse-core/ eclipse-core/META-INF/ eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ eclipse-test/META-INF/ eclipse-test/src/org/apache
Author: rombert
Date: Wed May 14 22:56:49 2014
New Revision: 1594750
URL: http://svn.apache.org/r1594750
Log:
SLING-2651 - Manually trigger sync on files/directories
Allow publishing resources from arbitrary paths in content projects.
Added:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
(with props)
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentResourceTesterTest.java
(with props)
Modified:
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/plugin.xml
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportContentAction.java
Modified: sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF?rev=1594750r1=1594749r2=1594750view=diff
==
--- sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF Wed May 14
22:56:49 2014
@@ -24,6 +24,7 @@ Import-Package: org.apache.commons.httpc
org.apache.sling.ide.transport,
org.eclipse.core.commands,
org.eclipse.core.commands.operations,
+ org.eclipse.core.expressions,
org.eclipse.core.resources,
org.eclipse.debug.core,
org.eclipse.debug.core.model,
Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1594750r1=1594749r2=1594750view=diff
==
--- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Wed May 14 22:56:49 2014
@@ -171,4 +171,15 @@
name=org.apache.sling.ide.eclipse-core/bundle
/component
/extension
+
+ extension
+ point=org.eclipse.core.expressions.propertyTesters
+ propertyTester
+
id=org.apache.sling.ide.eclipse.internal.ExportableResourceTester
+ type=org.eclipse.core.resources.IResource
+ namespace=org.apache.sling.ide.eclipse
+ properties=canBeExported
+
class=org.apache.sling.ide.eclipse.core.internal.ContentResourceTester
+ /propertyTester
+ /extension
/plugin
Added:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java?rev=1594750view=auto
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
(added)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ContentResourceTester.java
Wed May 14 22:56:49 2014
@@ -0,0 +1,68 @@
+/*
+ * 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.core.internal;
+
+import org.apache.sling.ide.eclipse.core.ProjectUtil;
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+public class ContentResourceTester extends PropertyTester {
+
+private static final String PN_CAN_BE_EXPORTED = canBeExported;
+
+@Override
+public boolean test(Object receiver, String property, Object[] args,
Object expectedValue) {
+
+if (!PN_CAN_BE_EXPORTED.equals(property)) {
+return false;
+}
+
+// projects as such can always be exported
+if (receiver instanceof IProject) {
+return isContentProject(receiver);
+}
+
+// resources must be part of a content project and below the sync
directory
+if (receiver instanceof IResource) {
+IResource
[CONF] Apache Sling Sling IDE tooling User Guide
Robert Munteanu edited the page: Sling IDE tooling User Guide ... Bundle sync Troubleshooting All operations that are performed on the Sling launchpad are logged in the Sling console. To view these operations, open the Eclipse console view and select Open Console - Sling Console. Image Added Additional information can be obtained by enabling the Eclipse platform tracing facility. To do so, open the Eclipse preferences and navigate to General - Tracing. Make sure that 'Enable tracing' is checked and all options under 'Sling IDE Tooling' are enabled. Image Added 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: r1592964 - in /sling/trunk/tooling/ide/target-definition: org.apache.sling.ide.target-definition-dev.target org.apache.sling.ide.target-definition.target
Author: rombert Date: Wed May 7 10:36:00 2014 New Revision: 1592964 URL: http://svn.apache.org/r1592964 Log: SLING-3544 - Integration tests running against a live Sling Launchpad instance Update target definitions to pick up JUnit 4.10 from Orbit. This allows us to use rule chains. Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target?rev=1592964r1=1592963r2=1592964view=diff == --- sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target (original) +++ sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition-dev.target Wed May 7 10:36:00 2014 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -?pde version=3.8?target name=Sling IDE Tools sequenceNumber=43 +?pde version=3.8?target name=Sling IDE Tools sequenceNumber=44 locations location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit unit id=org.eclipse.jst.web_ui.feature.feature.group version=3.3.2.v201112072049-7F7AFO7C25ToiIbpoiuW12GT78Mciy6W7iwuxaco/ @@ -35,17 +35,18 @@ repository location=http://download.eclipse.org/technology/m2e/releases/1.2/1.2.0.20120903-1050/ /location location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit -unit id=org.json version=1.0.0.v201011060100/ +unit id=org.sonatype.tycho.m2e.feature.feature.group version=0.6.0.201207302152/ +repository location=http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152// +/location +location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit unit id=org.apache.commons.io version=2.0.1.v201105210651/ unit id=org.slf4j.api version=1.6.4.v20120130-2120/ -unit id=org.apache.commons.collections version=3.2.0.v201005080500/ unit id=org.apache.commons.httpclient version=3.1.0.v201012070820/ +unit id=org.apache.commons.collections version=3.2.0.v201005080500/ +unit id=org.junit version=4.10.0.v4_10_0_v20120426-0900/ +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.sonatype.tycho.m2e.feature.feature.group version=0.6.0.201207302152/ -repository location=http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.6.0/N/0.6.0.201207302152// -/location /locations targetJRE path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/ launcherArgs Modified: sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target?rev=1592964r1=1592963r2=1592964view=diff == --- sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target (original) +++ sling/trunk/tooling/ide/target-definition/org.apache.sling.ide.target-definition.target Wed May 7 10:36:00 2014 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -?pde version=3.8?target name=Sling IDE Tools sequenceNumber=38 +?pde version=3.8?target name=Sling IDE Tools sequenceNumber=39 locations location includeAllPlatforms=false includeConfigurePhase=false includeMode=planner includeSource=true type=InstallableUnit unit id=org.eclipse.m2e.feature.feature.group version=1.2.0.20120903-1050/ @@ -38,8 +38,9 @@ unit id=org.json version=1.0.0.v201011060100/ unit id=org.apache.commons.io version=2.0.1.v201105210651/ unit id=org.slf4j.api version=1.6.4.v20120130-2120/ -unit id=org.apache.commons.collections version=3.2.0.v201005080500/ unit id=org.apache.commons.httpclient version=3.1.0.v201012070820/ +unit id=org.apache.commons.collections version=3.2.0.v201005080500/ +unit id=org.junit version=4.10.0.v4_10_0_v20120426-0900/ repository location=http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/ /location /locations
svn commit: r908389 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/authentication/
Author: buildbot Date: Thu May 8 16:33:55 2014 New Revision: 908389 Log: Staging update by buildbot for sling Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-framework.html websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-tasks.html Propchange: websites/staging/sling/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 8 16:33:55 2014 @@ -1 +1 @@ -1592988 +1593323 Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html == --- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html (original) +++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html Thu May 8 16:33:55 2014 @@ -93,17 +93,17 @@ h2 id=osgi-http-service-specificationOSGi Http Service Specification/h2 pThe main support for authentication is defined by the OSGi Http Service specification. This specification defines how an OSGi application can register servlets and resources to build web applications. As part of the servlet and/or resource registration a codeHttpContext/code may be provided, which allows for additional support./p pThe main method of interest to the authentication process is the codehandleSecurity/code method. This is called by the OSGi Http Service implementation before the registered servlet is called. Its intent is to authenticate the request and to provide authentication information for the request object: the authentication type and the remote user name./p -pThe Sling Commons Auth bundle provides the codeAuthenticationSupport/code service which may be used to the implement the codeHttpContext.handleSecurity/code method./p +pThe Sling Auth Core bundle provides the codeAuthenticationSupport/code service which may be used to the implement the codeHttpContext.handleSecurity/code method./p h2 id=sling-engineSling Engine/h2 pThe Sling Engine implements the main entry point into the Sling system by means of the codeSlingMainServlet/code. This servlet is registered with the OSGi Http Service and provides a custom codeHttpContext/code whose codehandleSecurity/code method is implemented by the codeAuthenticationSupport/code service./p pWhen the request hits the codeservice/code method of the Sling Main Servlet, the resource resolver provided by the codeAuthenticationSupport/code service is retrieved from the request attributes and used as the resource resolver for the request./p pThat's all there is for the Sling Engine to do with respect to authentication./p -h2 id=sling-commons-authSling Commons Auth/h2 -pThe support for authenticating client requests is implemented in the Sling Commons Auth bundle. As such this bundle provides three areas of support/p +h2 id=sling-auth-coreSling Auth Core/h2 +pThe support for authenticating client requests is implemented in the Sling Auth Core bundle. As such this bundle provides three areas of support/p ul licodeAuthenticationHandler/code service interface. This is implemented by services providing functionality to extract credentials from HTTP requests./li -licodeAuthenticator/code service interface. This is implemented by the codeSlingAuthenticator/code class in the Commons Auth bundle and provides applications with entry points to login and logout./li -licodeAuthenticationSupport/code service interface. This is implemented by the codeSlingAuthenticator/code class in the Commons Auth bundle and allows applications registering with the OSGi HTTP Service to make use of the Sling authentication infrastructure./li +licodeAuthenticator/code service interface. This is implemented by the codeSlingAuthenticator/code class in the Sling Auth Core bundle and provides applications with entry points to login and logout./li +licodeAuthenticationSupport/code service interface. This is implemented by the codeSlingAuthenticator/code class in the Sling Auth Core bundle and allows applications registering with the OSGi HTTP Service to make use of the Sling authentication infrastructure./li /ul h2 id=jcr-repositoryJCR Repository/h2 pThe actual process of logging into the repository and provided a codeSession/code is implementation dependent. In the case of Jackrabbit extensibility is provided by configuration of the Jackrabbit repository by means of an interface and two helper classes:/p
svn commit: r908304 - /websites/production/sling/content/
Author: justin Date: Wed May 7 12:25:24 2014 New Revision: 908304 Log: Publishing svnmucc operation to sling site by justin Added: websites/production/sling/content/ - copied from r908303, websites/staging/sling/trunk/content/
