You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/05/02 08:58:45 UTC
svn commit: r652782 - in /incubator/sling/trunk:
maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/assembly/
maven/maven-sling-plugin/src/main/resources/META-INF/plexus/
osgi/console-web/ osgi/console-web/src/main/java/org/apache/sling/osgi...
Author: cziegeler
Date: Thu May 1 23:58:43 2008
New Revision: 652782
URL: http://svn.apache.org/viewvc?rev=652782&view=rev
Log:
SLING-404: Remove/disable assembly related stuff.
Removed:
incubator/sling/trunk/maven/maven-sling-plugin/src/main/java/org/apache/sling/maven/assembly/
Modified:
incubator/sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/sling/trunk/osgi/console-web/pom.xml
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/BundleListRender.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/UpdateAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/AbstractObrPlugin.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/BundleRepositoryRender.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/InstallFromRepoAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/RefreshRepoAction.java
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java
Modified: incubator/sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/plexus/components.xml?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/sling/trunk/maven/maven-sling-plugin/src/main/resources/META-INF/plexus/components.xml Thu May 1 23:58:43 2008
@@ -34,7 +34,6 @@
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>org.apache.sling:maven-sling-plugin:assembly</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
@@ -43,17 +42,5 @@
</lifecycles>
</configuration>
</component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>assembly</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>assembly</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <extension>jar</extension>
- <addedToClasspath>true</addedToClasspath>
- </configuration>
- </component>
</components>
</component-set>
Modified: incubator/sling/trunk/osgi/console-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/pom.xml?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/pom.xml (original)
+++ incubator/sling/trunk/osgi/console-web/pom.xml Thu May 1 23:58:43 2008
@@ -118,13 +118,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.assembly</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/BundleListRender.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/BundleListRender.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/BundleListRender.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/BundleListRender.java Thu May 1 23:58:43 2008
@@ -20,14 +20,10 @@
import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Iterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
-import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.osgi.assembly.installer.Resource;
import org.apache.sling.osgi.console.web.Render;
import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
import org.apache.sling.osgi.console.web.internal.Util;
@@ -70,7 +66,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.sling.manager.web.internal.Render#getName()
*/
public String getName() {
@@ -79,7 +75,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.sling.manager.web.internal.Render#getLabel()
*/
public String getLabel() {
@@ -88,7 +84,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.sling.manager.web.internal.internal.Render#render(javax.servlet.http.HttpServletRequest,
* javax.servlet.http.HttpServletResponse)
*/
@@ -317,7 +313,7 @@
if (bundle.getSymbolicName() == null) {
return false;
}
-
+/*
Version bundleVersion = Version.parseVersion((String) bundle.getHeaders().get(
Constants.BUNDLE_VERSION));
@@ -330,6 +326,7 @@
}
}
}
+*/
return false;
}
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/UpdateAction.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/UpdateAction.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/UpdateAction.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/core/UpdateAction.java Thu May 1 23:58:43 2008
@@ -19,13 +19,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.osgi.assembly.installer.Installer;
-import org.apache.sling.osgi.assembly.installer.InstallerException;
-import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.osgi.assembly.installer.VersionRange;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;
@@ -61,7 +56,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.sling.manager.web.internal.internal.Action#performAction(javax.servlet.http.HttpServletRequest)
*/
public boolean performAction(HttpServletRequest request,
@@ -84,12 +79,12 @@
}
private void updateFromRepo(final Bundle bundle) {
-
+/*
final InstallerService is = (InstallerService) installerService.getService();
if (is == null) {
return;
}
-
+
final String name = bundle.getSymbolicName();
final String version = (String) bundle.getHeaders().get(
Constants.BUNDLE_VERSION);
@@ -127,6 +122,7 @@
t.setDaemon(true); // make a daemon thread (detach from current thread)
t.start();
+ */
}
}
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/AbstractObrPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/AbstractObrPlugin.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/AbstractObrPlugin.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/AbstractObrPlugin.java Thu May 1 23:58:43 2008
@@ -18,8 +18,8 @@
*/
package org.apache.sling.osgi.console.web.internal.obr;
-import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
-import org.apache.sling.osgi.assembly.installer.InstallerService;
+//import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
+//import org.apache.sling.osgi.assembly.installer.InstallerService;
import org.apache.sling.osgi.console.web.internal.BaseManagementPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
@@ -33,7 +33,7 @@
super.setBundleContext(bundleContext);
}
-
+/*
protected InstallerService getInstallerService() {
if (installerService == null) {
try {
@@ -53,5 +53,5 @@
protected BundleRepositoryAdmin getBundleRepositoryAdmin() {
InstallerService is = getInstallerService();
return (is != null) ? is.getBundleRepositoryAdmin() : null;
- }
+ }*/
}
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/BundleRepositoryRender.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/BundleRepositoryRender.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/BundleRepositoryRender.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/BundleRepositoryRender.java Thu May 1 23:58:43 2008
@@ -16,29 +16,13 @@
*/
package org.apache.sling.osgi.console.web.internal.obr;
-import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
import java.util.StringTokenizer;
-import java.util.TreeSet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
-import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.osgi.assembly.installer.Repository;
-import org.apache.sling.osgi.assembly.installer.Resource;
import org.apache.sling.osgi.console.web.Render;
import org.apache.sling.osgi.console.web.internal.Util;
import org.osgi.framework.Bundle;
@@ -46,7 +30,7 @@
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-public class BundleRepositoryRender extends AbstractObrPlugin implements Render {
+public abstract class BundleRepositoryRender extends AbstractObrPlugin implements Render {
public static final String NAME = "bundlerepo";
@@ -83,7 +67,7 @@
public String getLabel() {
return LABEL;
}
-
+/*
public void render(HttpServletRequest request, HttpServletResponse response)
throws IOException {
@@ -153,7 +137,7 @@
this.listResources(pw);
}
-
+*/
private void header(PrintWriter pw) {
pw.println("<table class='content' cellpadding='0' cellspacing='0' width='100%'>");
pw.println("<tr class='content'>");
@@ -189,7 +173,7 @@
pw.println("<th class='content'>Version</th>");
pw.println("</tr>");
}
-
+/*
private void listResources(PrintWriter pw) {
InstallerService is = getInstallerService();
if (is == null) {
@@ -254,7 +238,7 @@
pw.println("</tr>");
}
-
+*/
private void resourcesButtons(PrintWriter pw) {
pw.println("<tr class='content'>");
pw.println("<td class='content'> </td>");
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/InstallFromRepoAction.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/InstallFromRepoAction.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/InstallFromRepoAction.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/InstallFromRepoAction.java Thu May 1 23:58:43 2008
@@ -16,17 +16,9 @@
*/
package org.apache.sling.osgi.console.web.internal.obr;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.sling.osgi.assembly.installer.Installer;
-import org.apache.sling.osgi.assembly.installer.InstallerException;
-import org.apache.sling.osgi.assembly.installer.InstallerService;
-import org.apache.sling.osgi.assembly.installer.VersionRange;
import org.apache.sling.osgi.console.web.Action;
-import org.osgi.service.log.LogService;
-public class InstallFromRepoAction extends AbstractObrPlugin implements Action {
+public abstract class InstallFromRepoAction extends AbstractObrPlugin implements Action {
public static final String NAME = "installFromOBR";
@@ -40,10 +32,9 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.sling.manager.web.internal.Action#performAction(javax.servlet.http.HttpServletRequest,
* javax.servlet.http.HttpServletResponse)
- */
public boolean performAction(HttpServletRequest request,
HttpServletResponse response) {
@@ -91,5 +82,6 @@
// redirect to bundle list
return true;
}
+ */
}
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/RefreshRepoAction.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/RefreshRepoAction.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/RefreshRepoAction.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/obr/RefreshRepoAction.java Thu May 1 23:58:43 2008
@@ -16,17 +16,9 @@
*/
package org.apache.sling.osgi.console.web.internal.obr;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.sling.osgi.assembly.installer.BundleRepositoryAdmin;
-import org.apache.sling.osgi.assembly.installer.Repository;
import org.apache.sling.osgi.console.web.Action;
-public class RefreshRepoAction extends AbstractObrPlugin implements Action {
+public abstract class RefreshRepoAction extends AbstractObrPlugin implements Action {
public static final String NAME = "refreshOBR";
@@ -39,7 +31,7 @@
public String getLabel() {
return NAME;
}
-
+/*
public boolean performAction(HttpServletRequest request,
HttpServletResponse response) {
@@ -91,5 +83,5 @@
return null;
}
-
+*/
}
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java?rev=652782&r1=652781&r2=652782&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java Thu May 1 23:58:43 2008
@@ -56,11 +56,7 @@
import org.apache.sling.osgi.console.web.internal.core.StopAction;
import org.apache.sling.osgi.console.web.internal.core.UninstallAction;
import org.apache.sling.osgi.console.web.internal.core.UpdateAction;
-import org.apache.sling.osgi.console.web.internal.misc.AssemblyListRender;
import org.apache.sling.osgi.console.web.internal.misc.ConfigurationRender;
-import org.apache.sling.osgi.console.web.internal.obr.BundleRepositoryRender;
-import org.apache.sling.osgi.console.web.internal.obr.InstallFromRepoAction;
-import org.apache.sling.osgi.console.web.internal.obr.RefreshRepoAction;
import org.apache.sling.osgi.console.web.internal.system.GCAction;
import org.apache.sling.osgi.console.web.internal.system.ShutdownAction;
import org.apache.sling.osgi.console.web.internal.system.ShutdownRender;
@@ -128,9 +124,8 @@
AjaxBundleDetailsAction.class, BundleListRender.class,
InstallAction.class, RefreshPackagesAction.class,
SetStartLevelAction.class, StartAction.class, StopAction.class,
- UninstallAction.class, UpdateAction.class, AssemblyListRender.class,
- ConfigurationRender.class, BundleRepositoryRender.class,
- InstallFromRepoAction.class, RefreshRepoAction.class, GCAction.class,
+ UninstallAction.class, UpdateAction.class,
+ ConfigurationRender.class, GCAction.class,
ShutdownAction.class, ShutdownRender.class, VMStatRender.class };
private BundleContext bundleContext;