You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:26:39 UTC
[sling-org-apache-sling-installer-console] branch master created
(now 6180d2a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git.
at 6180d2a SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 595a9f2 SLING-2568 : Move webconsole plugin into separate bundle
new 40390b1 Merge branch 'SLING-2527'
new ac6fa51 SLING-2612 : Add support for excluding artifacts for installation
new 6d23f4f SLING-2612 - EXCLUDED applies only to INSTALLED state IMO, and add (*) after INSTALLED if there's additional info
new e6a716e SLING-2612 : Add support for excluding artifacts for installation
new 7567434 Prepare release
new c8197a9 [maven-release-plugin] prepare release org.apache.sling.installer.console-1.0.0
new 157cb26 [maven-release-plugin] prepare for next development iteration
new c6a7aff Use latest snapshot after release
new c3dfb0c Use released version
new beb63db Use latest releases and update to new parent pom
new 57528cd Update to latest parent pom and use latest releases in launchpad
new 250be2f Correct reactor pom and update to parent pom 16
new c1da0cb Update to latest parent pom
new 46e3865 Update to parent pom 18
new 94e1115 Update to parent pom v19
new 12f898f Updated to parent version 20
new b49c201 Update to Sling Parent POM 22 with baselining enabled
new c51d760 SLING-4698 - Set parent.relativePath to empty for all modules
new 966f66a Update to Sling Parent 23
new c844617 set parent version to 24 and add empty relativePath where missing
new 7776630 Update the main reactor to parent 25
new 39558b7 SLING-5188 - Some WebConsole plugins are placed in the 'main' category
new 3940179 SLING-5188 - Some WebConsole plugins are placed in the 'main' category
new d93f144 Switch to parent pom 26
new 04fb73f SLING-6176 expose the error persisted by the OSGi installer in the web console
new 2397477 Use released OSGi installer Core 3.8.0
new f524378 [maven-release-plugin] prepare release org.apache.sling.installer.console-1.0.2
new 868c844 [maven-release-plugin] prepare for next development iteration
new fd5dd98 Update to parent pom 30
new 6180d2a SLING-7167 Adjust READMEs
The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-installer-console] 30/31: Update to parent
pom 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit fd5dd987a67f201d65ea89c43334f8fbaa7d681d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 8 11:50:27 2017 +0000
Update to parent pom 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1794342 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++-------
.../console/OsgiInstallerWebConsolePlugin.java | 31 +++++++++++-----------
2 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc02ae6..eb48b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>30</version>
<relativePath />
</parent>
@@ -46,10 +46,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -66,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -76,11 +72,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 19f07f0..35ada5c 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -30,11 +30,6 @@ import javax.servlet.GenericServlet;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.info.InfoProvider;
import org.apache.sling.installer.api.info.InstallationState;
@@ -44,21 +39,25 @@ import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.TaskResource;
import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
-@Component
-@Service(value=javax.servlet.Servlet.class)
-@Properties({
- @Property(name=Constants.SERVICE_DESCRIPTION, value="Apache Sling OSGi Installer Web Console Plugin"),
- @Property(name="felix.webconsole.label", value="osgi-installer"),
- @Property(name="felix.webconsole.title", value="OSGi Installer"),
- @Property(name="felix.webconsole.category", value="OSGi"),
- @Property(name="felix.webconsole.configprinter.modes", value={"zip", "txt"})
-})
+@Component(service=javax.servlet.Servlet.class,
+ property = {
+ Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
+ Constants.SERVICE_DESCRIPTION + "=Apache Sling OSGi Installer Web Console Plugin",
+ "felix.webconsole.label=osgi-installer",
+ "felix.webconsole.title=OSGi Installer",
+ "felix.webconsole.category=OSGi",
+ "felix.webconsole.configprinter.modes=zip",
+ "felix.webconsole.configprinter.modes=txt"
+ })
@SuppressWarnings("serial")
public class OsgiInstallerWebConsolePlugin extends GenericServlet {
- @Reference
+ @Reference(policyOption=ReferencePolicyOption.GREEDY)
private InfoProvider installer;
private String getType(final RegisteredResource rsrc) {
@@ -104,7 +103,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
return stateInfo;
}
-
+
private String getError(final Resource rsrc) {
String error = rsrc.getError();
return error != null ? error : "";
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 27/31: Use released OSGi
installer Core 3.8.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 2397477ae8a1046ad4aff78b78f43cb0753409d7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Nov 10 11:02:33 2016 +0000
Use released OSGi installer Core 3.8.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769084 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 87f4698..601dc01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.7.1-SNAPSHOT</version>
+ <version>3.8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 24/31: SLING-5188 - Some
WebConsole plugins are placed in the 'main' category
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 39401798a8756725a0d89f5085318a7c60153026
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 23 10:47:32 2015 +0000
SLING-5188 - Some WebConsole plugins are placed in the 'main' category
Place the OSGi installer console plugin under the OSGi category
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710168 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/core/impl/console/OsgiInstallerWebConsolePlugin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 499b336..33f02ec 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -52,7 +52,7 @@ import org.osgi.framework.Constants;
@Property(name=Constants.SERVICE_DESCRIPTION, value="Apache Sling OSGi Installer Web Console Plugin"),
@Property(name="felix.webconsole.label", value="osgi-installer"),
@Property(name="felix.webconsole.title", value="OSGi Installer"),
- @Property(name="felix.webconsole.category", value="Sling"),
+ @Property(name="felix.webconsole.category", value="OSGi"),
@Property(name="felix.webconsole.configprinter.modes", value={"zip", "txt"})
})
@SuppressWarnings("serial")
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 17/31: Updated to parent
version 20
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 12f898fb4b22007a334bbf475fcdd9042f12e6bb
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 99ef33a..3e2b351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 06/31: Prepare release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 7567434de6df9beffaa6834cdf107c725a33c550
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Oct 25 09:38:24 2012 +0000
Prepare release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1402044 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7be3801..892238a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 08/31:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 157cb26d36a45f3e9052ca5491870f429c3b6242
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Oct 25 09:43:07 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1402053 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4edbdc4..f8b93aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.installer.console</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer WebConsole Plugin</name>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/console</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/console</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/installer/console</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 16/31: Update to parent
pom v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 94e111563ae33eaf045a4cda866fd6734293bea7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 977488d..99ef33a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 10/31: Use released
version
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c3dfb0c86445442d391e3abacb9c2aa2ce181b51
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 30 08:07:41 2012 +0000
Use released version
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1403637 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3981a83..f8b93aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 05/31: SLING-2612 : Add
support for excluding artifacts for installation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit e6a716e0b3dc5a3f70f43bf25623d664484b4e34
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 2 09:00:15 2012 +0000
SLING-2612 : Add support for excluding artifacts for installation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1392797 13f79535-47bb-0310-9956-ffa450edef68
---
.../core/impl/console/OsgiInstallerWebConsolePlugin.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 003698b..8be72dd 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -91,15 +91,17 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
private String getState(final Resource rsrc) {
+ String stateInfo = rsrc.getState().toString();
// INSTALLED state has some variants
if ( rsrc.getState() == ResourceState.INSTALLED) {
- if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
- return "EXCLUDED";
- } else if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
- return "INSTALLED(*)";
+ if (rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ stateInfo = "EXCLUDED";
+ }
+ if (rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
+ stateInfo = stateInfo + "(*)";
}
}
- return rsrc.getState().toString();
+ return stateInfo;
}
private String getInfo(final RegisteredResource rsrc) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 04/31: SLING-2612 -
EXCLUDED applies only to INSTALLED state IMO,
and add (*) after INSTALLED if there's additional info
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 6d23f4fb08266c4ac4954ac7ac065055e6367f9c
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Oct 2 08:12:38 2012 +0000
SLING-2612 - EXCLUDED applies only to INSTALLED state IMO, and add (*) after INSTALLED if there's additional info
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1392785 13f79535-47bb-0310-9956-ffa450edef68
---
.../core/impl/console/OsgiInstallerWebConsolePlugin.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index dde505c..003698b 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -91,8 +91,13 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
private String getState(final Resource rsrc) {
- if ( rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
- return "EXCLUDED";
+ // INSTALLED state has some variants
+ if ( rsrc.getState() == ResourceState.INSTALLED) {
+ if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ return "EXCLUDED";
+ } else if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
+ return "INSTALLED(*)";
+ }
}
return rsrc.getState().toString();
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 18/31: Update to Sling
Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit b49c201f6b051cdefbbfea9fb20f828552124239
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:47:17 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628619 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3e2b351..aa5a219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 02/31: Merge branch
'SLING-2527'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 40390b102b5b8813a9484f5ecf9bcc35c9e809ac
Author: Ian Boston <ie...@apache.org>
AuthorDate: Thu Sep 27 10:07:25 2012 +0000
Merge branch 'SLING-2527'
* SLING-2527:
Adjusted API Bundle version number to 1.0-SNAPSHOT after feedback.
SLING-2527 Splits API from core in installer set of bundles.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1390919 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd79404..7be3801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.8</version>
+ <artifactId>org.apache.sling.installer.api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 01/31: SLING-2568 : Move
webconsole plugin into separate bundle
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 595a9f2640d8fde9dbab33f85bf50e00f7fafab4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Aug 23 16:38:20 2012 +0000
SLING-2568 : Move webconsole plugin into separate bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1376582 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 86 +++++++
.../console/OsgiInstallerWebConsolePlugin.java | 284 +++++++++++++++++++++
2 files changed, 370 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..bd79404
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>13</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.installer.console</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Installer WebConsole Plugin</name>
+ <description>
+ Provides a web console plugin for the OSGi installer
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/console</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/console</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/installer/console</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Private-Package>
+ org.apache.sling.installer.core.impl.console
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.3.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
new file mode 100644
index 0000000..53a3374
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -0,0 +1,284 @@
+/*
+ * 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.installer.core.impl.console;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.api.info.InfoProvider;
+import org.apache.sling.installer.api.info.InstallationState;
+import org.apache.sling.installer.api.info.Resource;
+import org.apache.sling.installer.api.info.ResourceGroup;
+import org.apache.sling.installer.api.tasks.RegisteredResource;
+import org.apache.sling.installer.api.tasks.ResourceState;
+import org.osgi.framework.Constants;
+
+
+@Component
+@Service(value=javax.servlet.Servlet.class)
+@Properties({
+ @Property(name=Constants.SERVICE_DESCRIPTION, value="Apache Sling OSGi Installer Web Console Plugin"),
+ @Property(name="felix.webconsole.label", value="osgi-installer"),
+ @Property(name="felix.webconsole.title", value="OSGi Installer"),
+ @Property(name="felix.webconsole.configprinter.modes", value={"zip", "txt"})
+})
+@SuppressWarnings("serial")
+public class OsgiInstallerWebConsolePlugin extends GenericServlet {
+
+ @Reference
+ private InfoProvider installer;
+
+ private String getType(final RegisteredResource rsrc) {
+ final String type = rsrc.getType();
+ if ( type.equals(InstallableResource.TYPE_BUNDLE) ) {
+ return "Bundles";
+ } else if ( type.equals(InstallableResource.TYPE_CONFIG) ) {
+ return "Configurations";
+ } else if ( type.equals(InstallableResource.TYPE_FILE) ) {
+ return "Files";
+ } else if ( type.equals(InstallableResource.TYPE_PROPERTIES) ) {
+ return "Properties";
+ }
+ return type;
+ }
+
+ private String getEntityId(final RegisteredResource rsrc, String alias) {
+ String id = rsrc.getEntityId();
+ final int pos = id.indexOf(':');
+ if ( pos != -1 ) {
+ id = id.substring(pos + 1);
+ }
+ return (alias == null ? id : id + '\n' + alias);
+ }
+
+ private String getURL(final Resource rsrc) {
+ if ( rsrc.getVersion() != null ) {
+ return rsrc.getURL() + " (" + rsrc.getVersion() + ")";
+ }
+ return rsrc.getURL();
+ }
+
+ private String getInfo(final RegisteredResource rsrc) {
+ return rsrc.getDigest() + '/' + String.valueOf(rsrc.getPriority());
+ }
+
+ /** Default date format used. */
+ private final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSS yyyy-MMM-dd");
+
+ /**
+ * Format a date
+ */
+ private synchronized String formatDate(final long time) {
+ if ( time == -1 ) {
+ return "-";
+ }
+ final Date d = new Date(time);
+ return dateFormat.format(d);
+ }
+
+ @Override
+ public void service(final ServletRequest req, final ServletResponse res)
+ throws IOException {
+ final PrintWriter pw = res.getWriter();
+
+ final InstallationState state = this.installer.getInstallationState();
+ pw.print("<p class='statline ui-state-highlight'>Apache Sling OSGi Installer");
+ if ( state.getActiveResources().size() == 0 && state.getInstalledResources().size() == 0 && state.getUntransformedResources().size() == 0 ) {
+ pw.print(" - no resources registered.");
+ }
+ pw.print("</p>");
+
+ String rt = null;
+ for(final ResourceGroup group : state.getActiveResources()) {
+ final Resource toActivate = group.getResources().get(0);
+ if ( !toActivate.getType().equals(rt) ) {
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+ pw.println("<div class='ui-widget-header ui-corner-top buttonGroup' style='height: 15px;'>");
+ pw.printf("<span style='float: left; margin-left: 1em;'>Active Resources - %s</span>", getType(toActivate));
+ pw.println("</div>");
+ pw.println("<table class='nicetable'><tbody>");
+ pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th></tr>");
+ rt = toActivate.getType();
+ }
+ pw.printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
+ getEntityId(toActivate, group.getAlias()),
+ getInfo(toActivate),
+ getURL(toActivate),
+ toActivate.getState());
+ }
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+ rt = null;
+
+ for(final ResourceGroup group : state.getInstalledResources()) {
+ final Collection<Resource> resources = group.getResources();
+ if (resources.size() > 0) {
+ final Iterator<Resource> iter = resources.iterator();
+ final Resource first = iter.next();
+ if ( !first.getType().equals(rt) ) {
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+ pw.println("<div class='ui-widget-header ui-corner-top buttonGroup' style='height: 15px;'>");
+ pw.printf("<span style='float: left; margin-left: 1em;'>Processed Resources - %s</span>", getType(first));
+ pw.println("</div>");
+ pw.println("<table class='nicetable'><tbody>");
+ pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th></tr>");
+ rt = first.getType();
+ }
+ pw.print("<tr><td>");
+ pw.print(getEntityId(first, group.getAlias()));
+ pw.print("</td><td>");
+ pw.print(getInfo(first));
+ pw.print("</td><td>");
+ pw.print(getURL(first));
+ pw.print("</td><td>");
+ pw.print(first.getState());
+ if ( first.getState() == ResourceState.INSTALLED ) {
+ final long lastChange = first.getLastChange();
+ if ( lastChange > 0 ) {
+ pw.print("<br/>");
+ pw.print(formatDate(lastChange));
+ }
+ }
+ pw.print("</td></tr>");
+
+ while ( iter.hasNext() ) {
+ final Resource resource = iter.next();
+ pw.printf("<tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>",
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
+ }
+ }
+ }
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+
+ rt = null;
+ for(final RegisteredResource registeredResource : state.getUntransformedResources()) {
+ if ( !registeredResource.getType().equals(rt) ) {
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+ pw.println("<div class='ui-widget-header ui-corner-top buttonGroup' style='height: 15px;'>");
+ pw.printf("<span style='float: left; margin-left: 1em;'>Untransformed Resources - %s</span>", getType(registeredResource));
+ pw.println("</div>");
+ pw.println("<table class='nicetable'><tbody>");
+ pw.printf("<tr><th>Digest/Priority</th><th>URL</th></tr>");
+
+ rt = registeredResource.getType();
+ }
+ pw.printf("<tr><td>%s</td><td>%s</td></tr>",
+ getInfo(registeredResource),
+ registeredResource.getURL());
+ }
+ if ( rt != null ) {
+ pw.println("</tbody></table>");
+ }
+ }
+
+ /**
+ * Method for the configuration printer.
+ */
+ public void printConfiguration(final PrintWriter pw, final String mode) {
+ if ( !"zip".equals(mode) && !"txt".equals(mode) ) {
+ return;
+ }
+ pw.println("Apache Sling OSGi Installer");
+ pw.println("===========================");
+ final InstallationState state = this.installer.getInstallationState();
+ pw.println("Active Resources");
+ pw.println("----------------");
+ String rt = null;
+ for(final ResourceGroup group : state.getActiveResources()) {
+ final Resource toActivate = group.getResources().get(0);
+ if ( !toActivate.getType().equals(rt) ) {
+ pw.printf("%s:%n", getType(toActivate));
+ rt = toActivate.getType();
+ }
+ pw.printf("- %s: %s, %s, %s%n",
+ getEntityId(toActivate, group.getAlias()),
+ getInfo(toActivate),
+ getURL(toActivate),
+ toActivate.getState());
+ }
+ pw.println();
+
+ pw.println("Processed Resources");
+ pw.println("-------------------");
+ rt = null;
+ for(final ResourceGroup group : state.getInstalledResources()) {
+ final Collection<Resource> resources = group.getResources();
+ if (resources.size() > 0) {
+ final Iterator<Resource> iter = resources.iterator();
+ final Resource first = iter.next();
+ if ( !first.getType().equals(rt) ) {
+ pw.printf("%s:%n", getType(first));
+ rt = first.getType();
+ }
+ pw.printf("* %s: %s, %s, %s%n",
+ getEntityId(first, group.getAlias()),
+ getInfo(first),
+ getURL(first),
+ first.getState());
+ while ( iter.hasNext() ) {
+ final Resource resource = iter.next();
+ pw.printf(" - %s, %s, %s%n",
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
+ }
+ }
+ }
+ pw.println();
+
+ pw.println("Untransformed Resources");
+ pw.println("-----------------------");
+ rt = null;
+ for(final RegisteredResource registeredResource : state.getUntransformedResources()) {
+ if ( !registeredResource.getType().equals(rt) ) {
+ pw.printf("%s:%n", getType(registeredResource));
+ rt = registeredResource.getType();
+ }
+ pw.printf("- %s, %s%n",
+ getInfo(registeredResource),
+ registeredResource.getURL());
+ }
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 20/31: Update to Sling
Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 966f66aaa8e0bd76592959448348ca5f0a684ebe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a034f6f..7d1f06b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 26/31: SLING-6176 expose
the error persisted by the OSGi installer in the web console
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 04fb73f603fcb11f9702ac019ef089ca8d7faf52
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Oct 21 09:20:50 2016 +0000
SLING-6176 expose the error persisted by the OSGi installer in the web console
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1765969 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
.../console/OsgiInstallerWebConsolePlugin.java | 23 +++++++++++++++-------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d10eaa..87f4698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0.0</version>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 33f02ec..19f07f0 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -104,6 +104,11 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
return stateInfo;
}
+
+ private String getError(final Resource rsrc) {
+ String error = rsrc.getError();
+ return error != null ? error : "";
+ }
private String getInfo(final RegisteredResource rsrc) {
return rsrc.getDigest() + '/' + String.valueOf(rsrc.getPriority());
@@ -146,14 +151,15 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
pw.printf("<span style='float: left; margin-left: 1em;'>Active Resources - %s</span>", getType(toActivate));
pw.println("</div>");
pw.println("<table class='nicetable'><tbody>");
- pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th></tr>");
+ pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th><th>Error</th></tr>");
rt = toActivate.getType();
}
pw.printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
getEntityId(toActivate, group.getAlias()),
getInfo(toActivate),
getURL(toActivate),
- toActivate.getState());
+ toActivate.getState(),
+ getError(toActivate));
}
if ( rt != null ) {
pw.println("</tbody></table>");
@@ -173,7 +179,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
pw.printf("<span style='float: left; margin-left: 1em;'>Processed Resources - %s</span>", getType(first));
pw.println("</div>");
pw.println("<table class='nicetable'><tbody>");
- pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th></tr>");
+ pw.printf("<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th><th>Error</th></tr>");
rt = first.getType();
}
pw.print("<tr><td>");
@@ -191,22 +197,25 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
pw.print(formatDate(lastChange));
}
}
+ pw.print("</td><td>");
+ pw.print(getError(first));
pw.print("</td></tr>");
if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
- pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td><td></td></tr>",
first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
}
if ( first.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null ) {
- pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td><td></td></tr>",
first.getAttribute(TaskResource.ATTR_INSTALL_INFO));
}
while ( iter.hasNext() ) {
final Resource resource = iter.next();
- pw.printf("<tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>",
+ pw.printf("<tr><td></td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
getInfo(resource),
getURL(resource),
- resource.getState());
+ resource.getState(),
+ getError(resource));
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 19/31: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c51d76093d889bbb010b9f48366d74a64f038153
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index aa5a219..a034f6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.installer.console</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 31/31: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 6180d2ac1cb3d2962489ab283f61b8a70710768a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:31:32 2017 +0000
SLING-7167 Adjust READMEs
add missing README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810752 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1642058
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Installer WebConsole Plugin
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 23/31: SLING-5188 - Some
WebConsole plugins are placed in the 'main' category
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 39558b719783d98c14a2d363022ecb45e1235d07
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Oct 22 13:53:49 2015 +0000
SLING-5188 - Some WebConsole plugins are placed in the 'main' category
Added missing felix.webconsole.category property.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710018 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 8be72dd..499b336 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -52,6 +52,7 @@ import org.osgi.framework.Constants;
@Property(name=Constants.SERVICE_DESCRIPTION, value="Apache Sling OSGi Installer Web Console Plugin"),
@Property(name="felix.webconsole.label", value="osgi-installer"),
@Property(name="felix.webconsole.title", value="OSGi Installer"),
+ @Property(name="felix.webconsole.category", value="Sling"),
@Property(name="felix.webconsole.configprinter.modes", value={"zip", "txt"})
})
@SuppressWarnings("serial")
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 09/31: Use latest
snapshot after release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c6a7aff41b484b0666241f1331c062cd0251b659
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Oct 25 12:52:05 2012 +0000
Use latest snapshot after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1402134 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f8b93aa..3981a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 15/31: Update to parent
pom 18
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 46e38653e8907134a3c8c47966dc64d8eba11e52
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5c22c8b..977488d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 12/31: Update to latest
parent pom and use latest releases in launchpad
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 57528cd6bfe760ca2e174cb525e8bbc78e92e9c7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 18 08:38:52 2013 +0000
Update to latest parent pom and use latest releases in launchpad
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1447147 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3a11095..26f0f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14</version>
+ <version>15</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 03/31: SLING-2612 : Add
support for excluding artifacts for installation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit ac6fa5113625acf4c924165caa4d639751ad93a9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 2 07:50:50 2012 +0000
SLING-2612 : Add support for excluding artifacts for installation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1392776 13f79535-47bb-0310-9956-ffa450edef68
---
.../console/OsgiInstallerWebConsolePlugin.java | 47 +++++++++++++++++-----
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 53a3374..dde505c 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -42,6 +42,7 @@ import org.apache.sling.installer.api.info.Resource;
import org.apache.sling.installer.api.info.ResourceGroup;
import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResource;
import org.osgi.framework.Constants;
@@ -89,6 +90,13 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
return rsrc.getURL();
}
+ private String getState(final Resource rsrc) {
+ if ( rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ return "EXCLUDED";
+ }
+ return rsrc.getState().toString();
+ }
+
private String getInfo(final RegisteredResource rsrc) {
return rsrc.getDigest() + '/' + String.valueOf(rsrc.getPriority());
}
@@ -109,7 +117,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
@Override
public void service(final ServletRequest req, final ServletResponse res)
- throws IOException {
+ throws IOException {
final PrintWriter pw = res.getWriter();
final InstallationState state = this.installer.getInstallationState();
@@ -167,7 +175,7 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
pw.print("</td><td>");
pw.print(getURL(first));
pw.print("</td><td>");
- pw.print(first.getState());
+ pw.print(getState(first));
if ( first.getState() == ResourceState.INSTALLED ) {
final long lastChange = first.getLastChange();
if ( lastChange > 0 ) {
@@ -176,13 +184,21 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
}
}
pw.print("</td></tr>");
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
+ }
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null ) {
+ pw.printf("<tr><td></td><td colspan='2'>%s</td><td></td></tr>",
+ first.getAttribute(TaskResource.ATTR_INSTALL_INFO));
+ }
while ( iter.hasNext() ) {
final Resource resource = iter.next();
pw.printf("<tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>",
- getInfo(resource),
- getURL(resource),
- resource.getState());
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
}
}
}
@@ -205,8 +221,8 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
rt = registeredResource.getType();
}
pw.printf("<tr><td>%s</td><td>%s</td></tr>",
- getInfo(registeredResource),
- registeredResource.getURL());
+ getInfo(registeredResource),
+ registeredResource.getURL());
}
if ( rt != null ) {
pw.println("</tbody></table>");
@@ -256,13 +272,22 @@ public class OsgiInstallerWebConsolePlugin extends GenericServlet {
getEntityId(first, group.getAlias()),
getInfo(first),
getURL(first),
- first.getState());
+ getState(first));
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+ pw.printf(" : %s",
+ first.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED));
+ }
+ if ( first.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null ) {
+ pw.printf(" : %s",
+ first.getAttribute(TaskResource.ATTR_INSTALL_INFO));
+
+ }
while ( iter.hasNext() ) {
final Resource resource = iter.next();
pw.printf(" - %s, %s, %s%n",
- getInfo(resource),
- getURL(resource),
- resource.getState());
+ getInfo(resource),
+ getURL(resource),
+ resource.getState());
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 21/31: set parent
version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c844617f01e46e133b055286a30284b14ec3f689
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7d1f06b..f1204d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 14/31: Update to latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c1da0cbfd3bee2553f923dfdbdaca6facac311f1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7be114a..5c22c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 28/31:
[maven-release-plugin] prepare release
org.apache.sling.installer.console-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit f52437887018ff2d8d5cb640977f5da765c5a6f6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 21 11:07:58 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.console-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775392 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 601dc01..bf12660 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,11 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>26</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.installer.console</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer WebConsole Plugin</name>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/console</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/console</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/installer/console</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 22/31: Update the main
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 77766303c788f8becb60929e5688ea8ea065426b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f1204d6..e364861 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 25/31: Switch to parent
pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit d93f1443c2830b45288f70cce43dcd3fc051380f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e364861..5d10eaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 11/31: Use latest
releases and update to new parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit beb63db887840d2eb2c9ca9631d9f41b3d77c160
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Dec 23 06:53:35 2012 +0000
Use latest releases and update to new parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1425425 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f8b93aa..3a11095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13</version>
+ <version>14</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 29/31:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 868c8446d9131a8eff45580fc0cb8eb041163392
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 21 11:08:14 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775394 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bf12660..fc02ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.installer.console</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer WebConsole Plugin</name>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/console</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/console</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/installer/console</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 13/31: Correct reactor
pom and update to parent pom 16
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit 250be2fc2a56b88314b5894fd9df97d6158416c6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000
Correct reactor pom and update to parent pom 16
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 26f0f80..7be114a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
+ <version>16</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-console] 07/31:
[maven-release-plugin] prepare release
org.apache.sling.installer.console-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
commit c8197a9446386dbfb7086982584ed018a4bab2e0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Oct 25 09:42:49 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.console-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1402051 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 892238a..4edbdc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.installer.console</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer WebConsole Plugin</name>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/console</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/console</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/installer/console</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.console-1.0.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.