svn commit: r818804 - /sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java
Author: cziegeler
Date: Fri Sep 25 10:06:13 2009
New Revision: 818804
URL: http://svn.apache.org/viewvc?rev=818804view=rev
Log:
SLING-1124 : RunMode should only provide a configuration printer for the web
console
Modified:
sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java
Modified:
sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java?rev=818804r1=818803r2=818804view=diff
==
---
sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java
(original)
+++
sling/trunk/contrib/extensions/runmode/src/main/java/org/apache/sling/runmode/impl/RunModePanel.java
Fri Sep 25 10:06:13 2009
@@ -14,80 +14,22 @@
*/
package org.apache.sling.runmode.impl;
-import java.io.IOException;
import java.io.PrintWriter;
import java.util.Arrays;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.apache.felix.webconsole.ConfigurationPrinter;
import org.apache.sling.runmode.RunMode;
-import org.osgi.service.component.ComponentContext;
/**
* @scr.component metatype=no
* @scr.service
- * @scr.property name=felix.webconsole.label valueRef=LABEL
*/
-public class RunModePanel extends AbstractWebConsolePlugin implements Servlet,
-ConfigurationPrinter {
-
-private static final String LABEL = runmodes;
-
+public class RunModePanel implements ConfigurationPrinter {
private static final String TITLE = Run Modes;
/** @scr.reference */
private RunMode runMode;
-// -- AbstractWebConsolePlugin API
-
-@Override
-public String getLabel() {
-return LABEL;
-}
-
-@Override
-public String getTitle() {
-return TITLE;
-}
-
-@Override
-protected void renderContent(HttpServletRequest request,
-HttpServletResponse response) throws IOException {
-PrintWriter pw = response.getWriter();
-
-pw.println(pre);
-pw.println(/pre);
-
-pw.println(table class='content' cellpadding='0' cellspacing='0'
width='100%');
-
-pw.println(tr class='content');
-pw.println(th class='content container' colspan='2' + getTitle()
-+ /th);
-pw.println(/tr);
-
-pw.println(tr class='content');
-pw.println(td class='content'Current Run Modes/td);
-pw.println(td class='content');
-
-String[] modes = runMode.getCurrentRunModes();
-if (modes == null || modes.length == 0) {
-pw.println(-);
-} else {
-for (String mode : modes) {
-pw.print(mode);
-pw.println(br);
-}
-}
-
-pw.println(/td);
-pw.println(/tr);
-pw.println(/table);
-}
-
// -- ConfigurationPrinter
public void printConfiguration(PrintWriter pw) {
@@ -101,13 +43,7 @@
}
}
-// -- SCR integration
-
-protected void activate(ComponentContext context) {
-activate(context.getBundleContext());
-}
-
-protected void deactivate(ComponentContext context) {
-deactivate();
+public String getTitle() {
+return TITLE;
}
}
svn commit: r818877 - /sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java
Author: cziegeler
Date: Fri Sep 25 15:16:54 2009
New Revision: 818877
URL: http://svn.apache.org/viewvc?rev=818877view=rev
Log:
Remove unused import
Modified:
sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java
Modified:
sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java?rev=818877r1=818876r2=818877view=diff
==
---
sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java
(original)
+++
sling/trunk/bundles/commons/mime/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeWebConsolePlugin.java
Fri Sep 25 15:16:54 2009
@@ -22,7 +22,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -166,7 +165,7 @@
int slash = type.indexOf('/');
return (slash 0) ? type.substring(0, slash) : type;
}
-
+
private boolean spoolResource(HttpServletRequest request,
HttpServletResponse response) throws IOException {
svn commit: r818878 - /sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
Author: cziegeler
Date: Fri Sep 25 15:19:14 2009
New Revision: 818878
URL: http://svn.apache.org/viewvc?rev=818878view=rev
Log:
Update javadocs.
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java?rev=818878r1=818877r2=818878view=diff
==
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/scripting/SlingScript.java
Fri Sep 25 15:19:14 2009
@@ -22,14 +22,14 @@
/**
* The codeSlingScript/code defines the API for objects which encapsulate
- * a script resolved by the {...@link SlingScriptResolver}. To have a script
- * evaluated prepare a {...@link SlingBindings} instance of variables used as
- * global variables to the script and call the {...@link #eval(SlingBindings)}
- * method.
+ * a script. To evaluate a script prepare a {...@link SlingBindings} instance
of
+ * variables used as global variables to the script and call the
+ * {...@link #eval(SlingBindings)} method.
* p
- * Objects implementing this interface are returned by the
- * {...@link
SlingScriptResolver#findScript(org.apache.sling.api.resource.ResourceResolver,
String)}
- * method.
+ * You can obtain scripts by resolving a script resource through
+ * {...@link org.apache.sling.api.resource.ResourceResolver#resolve(String)}
+ * and then trying to adapt the resource to a script by
+ * calling {...@link Resource#adaptTo(Class)}.
*/
public interface SlingScript {
svn commit: r818893 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event: EventUtil.java impl/AbstractRepositoryEventHandler.java impl/EventHelper.java impl/JobEventHandler.
Author: cziegeler
Date: Fri Sep 25 15:58:10 2009
New Revision: 818893
URL: http://svn.apache.org/viewvc?rev=818893view=rev
Log:
SLING-1125 : Deprecate internal methods
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventUtil.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/EventHelper.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventUtil.java?rev=818893r1=818892r2=818893view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventUtil.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/EventUtil.java
Fri Sep 25 15:58:10 2009
@@ -336,7 +336,9 @@
* @param ignoreProps optional list of property which should be ignored
* @param binPropertyName The name of the binary property.
* @throws RepositoryException
+ * @deprecated
*/
+@Deprecated
public static void addProperties(final Node node,
final MapString, Object properties,
final String[] ignoreProps,
@@ -356,7 +358,9 @@
* @param ignoreProps optional list of property which should be ignored
* @param binPropertyName The name of the binary property.
* @throws RepositoryException
+ * @deprecated
*/
+@Deprecated
public static void addProperties(final Node node,
final EventPropertiesMap properties,
final String[] ignoreProps,
@@ -410,34 +414,20 @@
* loader is used to load these objects.
* @throws RepositoryException
* @throws ClassNotFoundException
+ * @deprecated
*/
+@Deprecated
public static EventPropertiesMap readProperties(final Node node,
final String
binPropertyName,
final String[]
ignorePrefixes)
throws RepositoryException, ClassNotFoundException {
-return readProperties(node, binPropertyName, ignorePrefixes,
Thread.currentThread().getContextClassLoader());
-}
-
-/**
- * Read properties from a repository node and create a property map.
- * As the properties might contain serialized java objects, a class loader
can be specified
- * for loading classes of the serialized java objects.
- * @throws RepositoryException
- * @throws ClassNotFoundException
- * @since 2.0.6
- */
-public static EventPropertiesMap readProperties(final Node node,
-final String
binPropertyName,
-final String[]
ignorePrefixes,
-final ClassLoader
objectClassLoader)
-throws RepositoryException, ClassNotFoundException {
final MapString, Object properties = new HashMapString, Object();
// check the properties blob
if ( node.hasProperty(binPropertyName) ) {
try {
final ObjectInputStream ois = new
ObjectInputStream(node.getProperty(binPropertyName).getStream(),
-objectClassLoader);
+Thread.currentThread().getContextClassLoader());
int length = ois.readInt();
for(int i=0;ilength;i++) {
final String key = (String)ois.readObject();
@@ -503,7 +493,9 @@
* Return the converted repository property name
* @param name The java object property name
* @return The converted name or null if not possible.
+ * @deprecated
*/
+@Deprecated
public static String getNodePropertyName(final String name) {
// if name contains a colon, we can't set it as a property
if ( name.indexOf(':') != -1 ) {
@@ -517,7 +509,9 @@
* @param valueFactory The value factory
* @param eventValue The event value
* @return The converted value or null if not possible
+ * @deprecated
*/
+@Deprecated
public static Value getNodePropertyValue(final ValueFactory valueFactory,
final Object eventValue) {
final Value val;
if (eventValue instanceof Calendar) {
@@ -541,7 +535,9 @@
* @param value
* @return
* @throws RepositoryException
+ * @deprecated
*/
svn commit: r818898 - in /sling/trunk/contrib/extensions: event-recorder/ rewriter/pom.xml
Author: cziegeler Date: Fri Sep 25 16:03:04 2009 New Revision: 818898 URL: http://svn.apache.org/viewvc?rev=818898view=rev Log: Remove event recorder - it is now part of the Felix event plugin for the web console Removed: sling/trunk/contrib/extensions/event-recorder/ Modified: sling/trunk/contrib/extensions/rewriter/pom.xml Modified: sling/trunk/contrib/extensions/rewriter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/pom.xml?rev=818898r1=818897r2=818898view=diff == --- sling/trunk/contrib/extensions/rewriter/pom.xml (original) +++ sling/trunk/contrib/extensions/rewriter/pom.xml Fri Sep 25 16:03:04 2009 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.rewriter/artifactId -version0.7.0-SNAPSHOT/version +version0.7.0-tlp-817658/version packagingbundle/packaging nameApache Sling Rewriter/name @@ -96,7 +96,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.html/artifactId -version0.9.0-SNAPSHOT/version +version0.9.0-R805442/version scopeprovided/scope /dependency dependency
svn commit: r818899 - /sling/trunk/contrib/extensions/rewriter/pom.xml
Author: cziegeler Date: Fri Sep 25 16:04:05 2009 New Revision: 818899 URL: http://svn.apache.org/viewvc?rev=818899view=rev Log: Correct pom Modified: sling/trunk/contrib/extensions/rewriter/pom.xml Modified: sling/trunk/contrib/extensions/rewriter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/pom.xml?rev=818899r1=818898r2=818899view=diff == --- sling/trunk/contrib/extensions/rewriter/pom.xml (original) +++ sling/trunk/contrib/extensions/rewriter/pom.xml Fri Sep 25 16:04:05 2009 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.rewriter/artifactId -version0.7.0-tlp-817658/version +version0.7.0-SNAPSHOT/version packagingbundle/packaging nameApache Sling Rewriter/name @@ -96,7 +96,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.html/artifactId -version0.9.0-R805442/version +version0.9.0-SNAPSHOT/version scopeprovided/scope /dependency dependency
