This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch jakarta-servlet-6
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/jakarta-servlet-6 by this push:
new 16f0d818ce No need to branch webconsole plugins
16f0d818ce is described below
commit 16f0d818cee232bbaa76a218df69d37b6c92eddc
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Aug 22 08:05:13 2023 +0200
No need to branch webconsole plugins
---
webconsole-plugins/metatype/pom.xml | 102 ----
.../plugins/metatype/internal/Activator.java | 73 ---
.../internal/MetatypeInventoryPrinter.java | 438 ------------------
webconsole-plugins/obr/changelog.txt | 28 --
webconsole-plugins/obr/pom.xml | 143 ------
.../main/appended-resources/META-INF/DEPENDENCIES | 18 -
.../AbstractBundleRepositoryRenderHelper.java | 74 ---
.../webconsole/plugins/obr/internal/Activator.java | 103 -----
.../FelixBundleRepositoryRenderHelper.java | 359 ---------------
.../plugins/obr/internal/FelixDeployer.java | 114 -----
.../internal/OsgiBundleRepositoryRenderHelper.java | 346 --------------
.../plugins/obr/internal/OsgiDeployer.java | 110 -----
.../plugins/obr/internal/WebConsolePlugin.java | 330 -------------
.../main/resources/OSGI-INF/l10n/bundle.properties | 49 --
.../resources/OSGI-INF/l10n/bundle_bg.properties | 49 --
.../resources/OSGI-INF/l10n/bundle_de.properties | 50 --
.../resources/OSGI-INF/l10n/bundle_ru.properties | 49 --
.../obr/src/main/resources/res/plugin.css | 23 -
.../obr/src/main/resources/res/plugin.html | 104 -----
.../obr/src/main/resources/res/plugin.js | 511 ---------------------
20 files changed, 3073 deletions(-)
diff --git a/webconsole-plugins/metatype/pom.xml
b/webconsole-plugins/metatype/pom.xml
deleted file mode 100644
index 9bcab1f7f6..0000000000
--- a/webconsole-plugins/metatype/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
- 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.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>8-SNAPSHOT</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.felix.webconsole.plugins.metatype</artifactId>
- <packaging>bundle</packaging>
- <version>2.0.0-SNAPSHOT</version>
-
- <name>Apache Felix Web Console Metatype Service Inventory Printer</name>
- <description>
- This is an Apache Felix InventoryPrinter for printing Metatype Service
information
- </description>
-
- <scm>
-
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- </scm>
-
- <properties>
- <felix.java.version>17</felix.java.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.8</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${project.artifactId}
- </Bundle-SymbolicName>
- <Bundle-Activator>
-
org.apache.felix.webconsole.plugins.metatype.internal.Activator
- </Bundle-Activator>
- <Import-Package>
- !org.osgi.service.metatype,*
- </Import-Package>
- <DynamicImport-Package>
- org.osgi.service.metatype; version="[1.1,2)"
- </DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
-
<excludePackageNames>org.apache.felix.webconsole.plugins.metatype.internal</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>8.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.metatype</artifactId>
- <version>1.4.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.inventory</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git
a/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/Activator.java
b/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/Activator.java
deleted file mode 100644
index a2632dfd63..0000000000
---
a/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/Activator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.metatype.internal;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.metatype.MetaTypeService;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-/**
- * Activator is the main starting class.
- */
-public class Activator implements BundleActivator, ServiceTrackerCustomizer
-{
-
- private static final String META_TYPE_NAME =
"org.osgi.service.metatype.MetaTypeService"; //$NON-NLS-1$
-
- private ServiceTracker tracker;
- private BundleContext context;
-
- /**
- * @see
org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public final void start(BundleContext context) throws Exception
- {
- this.context = context;
- this.tracker = new ServiceTracker(context, META_TYPE_NAME, this);
- this.tracker.open();
- }
-
- /**
- * @see
org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public final void stop(BundleContext context) throws Exception
- {
- if (tracker != null)
- {
- tracker.close();
- tracker = null;
- }
- }
-
- public final void modifiedService(ServiceReference reference, Object
service)
- {/* unused */
- }
-
- public final Object addingService(ServiceReference reference)
- {
- final MetaTypeService service = (MetaTypeService)
context.getService(reference);
- return new MetatypeInventoryPrinter(context, service);
- }
-
- public final void removedService(ServiceReference reference, Object
service)
- {
- ((MetatypeInventoryPrinter) service).unregister();
- }
-}
diff --git
a/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
b/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
deleted file mode 100644
index 377ac80961..0000000000
---
a/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.metatype.internal;
-
-import java.io.PrintWriter;
-import java.util.Hashtable;
-
-import org.apache.felix.inventory.Format;
-import org.apache.felix.inventory.InventoryPrinter;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.metatype.AttributeDefinition;
-import org.osgi.service.metatype.MetaTypeInformation;
-import org.osgi.service.metatype.MetaTypeService;
-import org.osgi.service.metatype.ObjectClassDefinition;
-
-/**
- * the {@code MetaTypeInve}
- */
-class MetatypeInventoryPrinter implements InventoryPrinter
-{
-
- private final BundleContext bundleContext;
- private final MetaTypeService metatype;
-
- private ServiceRegistration registration;
-
- @SuppressWarnings("serial")
- MetatypeInventoryPrinter(final BundleContext bundleContext, final
MetaTypeService metatype)
- {
- this.bundleContext = bundleContext;
- this.metatype = metatype;
-
- this.registration =
bundleContext.registerService(InventoryPrinter.SERVICE, this,
- new Hashtable<String, Object>()
- {
- {
- put(InventoryPrinter.NAME, "metatype");
- put(InventoryPrinter.TITLE, "Metatype Service");
- put(InventoryPrinter.FORMAT, new String[]
- { Format.TEXT.toString(), Format.JSON.toString() });
- }
- });
- }
-
- void unregister()
- {
- ServiceRegistration registration = this.registration;
- this.registration = null;
- if (registration != null)
- {
- registration.unregister();
- }
- }
-
- public String getTitle()
- {
- return "Metatype Service";
- }
-
- public void print(PrintWriter printWriter, Format format, boolean isZip)
- {
- final Bundle[] bundles = this.bundleContext.getBundles();
- final Printer printer = (format == Format.JSON) ? new
JsonPrinter(printWriter) : new TextPrinter(printWriter);
-
- printer.start();
- for (Bundle bundle : bundles)
- {
- printComponents(printer, bundle,
metatype.getMetaTypeInformation(bundle));
- }
- printer.end();
- }
-
- private static final void printComponents(final Printer pw, final Bundle
bundle, final MetaTypeInformation info)
- {
- if (info == null)
- {
- return;
- }
-
- final String[] pids = info.getPids();
- final String[] factoryPids = info.getFactoryPids();
- if ((pids == null || pids.length == 0) && (factoryPids == null ||
factoryPids.length == 0))
- {
- return;
- }
-
- pw.group(bundle.getSymbolicName() + " (" + bundle.getBundleId() + ")");
-
- // PIDs
- if (pids != null && pids.length > 0)
- {
- for (String pid : pids)
- {
- ocd(pw, info.getObjectClassDefinition(pid, null), pid);
- }
- }
-
- // Factory PIDs
- if (factoryPids != null && factoryPids.length > 0)
- {
- for (String factoryPid : factoryPids)
- {
- ocd(pw, info.getObjectClassDefinition(factoryPid, null),
factoryPid);
- }
- }
-
- pw.endGroup();
- }
-
- private static final void ocd(final Printer pw, final
ObjectClassDefinition ocd, String id)
- {
- pw.group(id);
- pw.keyValue("name", ocd.getName());
- pw.keyValue("description", ocd.getDescription());
-
- AttributeDefinition[] ads =
ocd.getAttributeDefinitions(ObjectClassDefinition.ALL);
- if (ads != null)
- {
- pw.group("attributes");
- for (AttributeDefinition ad : ads)
- {
- ad(pw, ad);
- }
- pw.endGroup();
- }
-
- pw.endGroup();
- }
-
- private static final void ad(final Printer pw, final AttributeDefinition
ad)
- {
- pw.group(ad.getID());
- pw.keyValue("name", ad.getName());
- pw.keyValue("description", ad.getDescription());
- pw.keyValue("type", type(ad.getType()));
- pw.keyValue("cardinality", cardinality(ad.getCardinality()));
- defaultValue(pw, ad.getDefaultValue());
- options(pw, ad.getOptionLabels(), ad.getOptionValues());
- pw.endGroup();
- }
-
- private static final void defaultValue(final Printer pw, final String[]
defaultValue)
- {
- if (defaultValue != null)
- {
- switch (defaultValue.length)
- {
- case 0: // ignore
- break;
-
- case 1:
- pw.keyValue("default", defaultValue[0]);
- break;
-
- default:
- pw.list("default", defaultValue);
- break;
- }
- }
- }
-
- private static final void options(final Printer pw, final String[]
optionLabels, final String[] optionValues)
- {
- if (optionLabels != null && optionLabels.length > 0)
- {
- pw.group("options");
- for (int i = 0; i < optionLabels.length; i++)
- {
- pw.keyValue(optionLabels[i], optionValues[i]);
- }
- pw.endGroup();
- }
- }
-
- @SuppressWarnings("deprecation")
- private static final String type(final int type)
- {
- switch (type)
- {
- case AttributeDefinition.BIGDECIMAL:
- return "BigDecimal";
- case AttributeDefinition.BIGINTEGER:
- return "BigInteger";
- case AttributeDefinition.BOOLEAN:
- return "Boolean";
- case AttributeDefinition.BYTE:
- return "Byte";
- case AttributeDefinition.CHARACTER:
- return "Character";
- case AttributeDefinition.DOUBLE:
- return "Double";
- case AttributeDefinition.FLOAT:
- return "Float";
- case AttributeDefinition.INTEGER:
- return "Integer";
- case AttributeDefinition.LONG:
- return "Long";
- case AttributeDefinition.SHORT:
- return "Short";
- case AttributeDefinition.STRING:
- return "String";
- case 12 /* PASSWORD */:
- return "Password";
- default:
- return String.valueOf(type);
- }
- }
-
- private static final String cardinality(final int cardinality)
- {
- if (cardinality == 0)
- {
- return "required";
- }
- else if (cardinality == Integer.MAX_VALUE || cardinality ==
Integer.MIN_VALUE)
- {
- return "unlimited";
- }
- else
- {
- return String.valueOf(Math.abs(cardinality));
- }
- }
-
- private static interface Printer
- {
- void start();
-
- void end();
-
- void group(String name);
-
- void endGroup();
-
- void list(String name, String[] values);
-
- void keyValue(String key, String value);
-
- }
-
- private static class TextPrinter implements Printer
- {
-
- private final PrintWriter pw;
-
- private String indent;
-
- TextPrinter(final PrintWriter pw)
- {
- this.pw = pw;
-
- this.indent = "";
- }
-
- public void start()
- {
- }
-
- public void end()
- {
- }
-
- public void group(String name)
- {
- this.pw.printf("%s%s:%n", indent, name);
- this.indent += " ";
- }
-
- public void endGroup()
- {
- if (this.indent.length() > 2)
- {
- this.indent = this.indent.substring(0, this.indent.length() -
2);
- }
- }
-
- public void list(String name, String[] values)
- {
- this.pw.printf("%s%s: [", indent, name);
- boolean first = true;
- for (String val : values)
- {
- if (first) {
- first = false;
- } else {
- this.pw.print(", ");
- }
- this.pw.print(val);
- }
- this.pw.println("]");
- }
-
- public void keyValue(String key, String value)
- {
- this.pw.printf("%s%s: %s%n", indent, key, value);
- }
- }
-
- private static class JsonPrinter implements Printer
- {
- private boolean needsComma;
-
- private final PrintWriter pw;
-
- JsonPrinter(final PrintWriter pw)
- {
- this.pw = pw;
- }
-
- public void start()
- {
- this.pw.print('{');
- }
-
- public void end()
- {
- this.pw.print('}');
- }
-
- private void key(String name) {
- if (needsComma) {
- this.pw.print(',');
- }
- this.pw.print('"');
- this.pw.print(name);
- this.pw.print("\" : ");
- }
-
- public void group(String name)
- {
- this.key(name);
- this.pw.print('{');
- this.needsComma = false;
- }
-
- public void endGroup()
- {
- this.pw.print('}');
- this.needsComma = true;
- }
-
- public void list(String name, String[] values)
- {
- this.key(name);
- this.pw.print('[');
- boolean first = true;
- for (String val : values) {
- if (first) {
- first = false;
- } else {
- this.pw.print(',');
- }
- value(val);
- }
- this.pw.print(']');
- this.needsComma = true;
- }
-
- private void value(String value)
- {
- if (value == null) {
- this.pw.print("null");
- } else {
- this.pw.print('"');
- // escape the value
- final int len = value.length();
- for(int i=0;i<len;i++){
- final char c = value.charAt(i);
- switch(c){
- case '"':
- this.pw.print("\\\"");
- break;
- case '\\':
- this.pw.print("\\\\");
- break;
- case '\b':
- this.pw.print("\\b");
- break;
- case '\f':
- this.pw.print("\\f");
- break;
- case '\n':
- this.pw.print("\\n");
- break;
- case '\r':
- this.pw.print("\\r");
- break;
- case '\t':
- this.pw.print("\\t");
- break;
- case '/':
- this.pw.print("\\/");
- break;
- default:
- if ((c>='\u0000' && c<='\u001F') || (c>='\u007F' &&
c<='\u009F') || (c>='\u2000' && c<='\u20FF'))
- {
- final String hex=Integer.toHexString(c);
- this.pw.print("\\u");
- for(int k=0;k<4-hex.length();k++){
- this.pw.print('0');
- }
- this.pw.print(hex.toUpperCase());
- }
- else{
- this.pw.print(c);
- }
- }
- }
- this.pw.print('"');
- }
- }
-
- public void keyValue(String key, String value)
- {
- key(key);
- value(value);
- this.needsComma = true;
- }
- }
-}
diff --git a/webconsole-plugins/obr/changelog.txt
b/webconsole-plugins/obr/changelog.txt
deleted file mode 100644
index 0c2debd914..0000000000
--- a/webconsole-plugins/obr/changelog.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Changes from 1.0.2 to 1.0.4
----------------------------
-** Improvement
- * [FELIX-5510] - Remove usage of org.json form web console plugins
-
-
-Changes from 1.0.0 to 1.0.2
----------------------------
-
-** Bug
- * [FELIX-4564] - JSON Output overwrites resource information
-
-** Improvement
- * [FELIX-3861] - Set felix.webconsole.category on Web Console plugins
-
-
-Initial Release 1.0.0
----------------------
-
-** Bug
- * [FELIX-3268] - Cannot build webconsole and webconsole-plugins with JDK 7
- * [FELIX-3503] - The obr page in the webconsole does not update on refresh
-
-** Improvement
- * [FELIX-3111] - Separate OBR Plugin
-
-** Task
- * [FELIX-3531] - Update to parent pom 2.1 and fix license files
diff --git a/webconsole-plugins/obr/pom.xml b/webconsole-plugins/obr/pom.xml
deleted file mode 100644
index eb6cb800d7..0000000000
--- a/webconsole-plugins/obr/pom.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<!-- 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.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>8-SNAPSHOT</version>
- <relativePath>../../../pom/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.felix.webconsole.plugins.obr</artifactId>
- <packaging>bundle</packaging>
- <version>3.0.0-SNAPSHOT</version>
-
- <name>Apache Felix Web Console OBR Plugin</name>
- <description>
- This Apache Felix OSGi web console plugin provides method to install
bundles from a bundle repository.
- </description>
-
- <scm>
-
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- </scm>
-
- <properties>
- <felix.java.version>17</felix.java.version>
- </properties>
-
- <build>
- <plugins>
- <!-- translate UTF-8 encoded properties files to
ISO-8859-1 -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <goals>
-
<goal>native2ascii</goal>
- </goals>
- <configuration>
-
<encoding>UTF-8</encoding>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.8</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>
- ${artifactId}
- </Bundle-SymbolicName>
- <Bundle-Activator>
-
org.apache.felix.webconsole.plugins.obr.internal.Activator
- </Bundle-Activator>
- <DynamicImport-Package>
- org.apache.felix.bundlerepository,
- org.osgi.service.obr
- </DynamicImport-Package>
- <Include-Resource>
- {maven-resources},OSGI-INF=target/classes/OSGI-INF
- </Include-Resource>
- <Embed-Dependency>
-
org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <includes>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>src/main/appended-resources/**</exclude>
- <exclude>src/main/resources/res/plugin.html</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>8.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.8</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi and Apache Felix OBR API -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.service.obr</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>2.0.10</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git
a/webconsole-plugins/obr/src/main/appended-resources/META-INF/DEPENDENCIES
b/webconsole-plugins/obr/src/main/appended-resources/META-INF/DEPENDENCIES
deleted file mode 100644
index b44c872855..0000000000
--- a/webconsole-plugins/obr/src/main/appended-resources/META-INF/DEPENDENCIES
+++ /dev/null
@@ -1,18 +0,0 @@
-I. Included Third-Party Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-
-II. Used Third-Party Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2012).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-
-- Apache License 2.0
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/AbstractBundleRepositoryRenderHelper.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/AbstractBundleRepositoryRenderHelper.java
deleted file mode 100644
index ab7a3986e0..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/AbstractBundleRepositoryRenderHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import java.io.IOException;
-
-import jakarta.servlet.ServletException;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-
-abstract class AbstractBundleRepositoryRenderHelper
-{
-
- protected final AbstractWebConsolePlugin logger;
-
- private final ServiceTracker repositoryAdmin;
-
-
- protected AbstractBundleRepositoryRenderHelper( final
AbstractWebConsolePlugin logger,
- final BundleContext bundleContext, final String serviceName )
- {
- this.logger = logger;
- this.repositoryAdmin = new ServiceTracker( bundleContext, serviceName,
null );
- this.repositoryAdmin.open();
- }
-
-
- void dispose()
- {
- repositoryAdmin.close();
- }
-
-
- boolean hasRepositoryAdmin()
- {
- return getRepositoryAdmin() != null;
- }
-
-
- protected final Object getRepositoryAdmin()
- {
- return repositoryAdmin.getService();
- }
-
-
- abstract void doDeploy( String[] bundles, boolean start, boolean optional
);
-
-
- abstract void doAction( String action, String urlParam ) throws
IOException, ServletException;
-
-
- abstract String getData( final String filter, final boolean details, final
Bundle[] bundles );
-
-}
\ No newline at end of file
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
deleted file mode 100644
index 0a5338058f..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-import org.apache.felix.webconsole.SimpleWebConsolePlugin;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-/**
- * Activator is the main starting class.
- */
-public class Activator implements BundleActivator, ServiceTrackerCustomizer,
Constants
-{
-
- private ServiceTracker tracker;
- private BundleContext context;
-
- private SimpleWebConsolePlugin plugin;
-
- /**
- * @see
org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public final void start(BundleContext context) throws Exception
- {
- this.context = context;
- Filter filter = context.createFilter("(|" //$NON-NLS-1$
- + '(' + OBJECTCLASS + "=org.osgi.service.obr.RepositoryAdmin)"
//$NON-NLS-1$
- + '(' + OBJECTCLASS +
"=org.apache.felix.bundlerepository.RepositoryAdmin)" //$NON-NLS-1$
- + ')');
- this.tracker = new ServiceTracker(context, filter, this);
- this.tracker.open();
- }
-
- /**
- * @see
org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public final void stop(BundleContext context) throws Exception
- {
- if (tracker != null)
- {
- tracker.close();
- tracker = null;
- }
- }
-
- // - begin tracker
- /**
- * @see
org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference,
- * java.lang.Object)
- */
- public final void modifiedService(ServiceReference reference, Object
service)
- {/* unused */
- }
-
- /**
- * @see
org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference)
- */
- public final Object addingService(ServiceReference reference)
- {
- SimpleWebConsolePlugin plugin = this.plugin;
- if (plugin == null)
- {
- this.plugin = plugin = new WebConsolePlugin().register(context);
- }
-
- return context.getService(reference);
- }
-
- /**
- * @see
org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(org.osgi.framework.ServiceReference,
- * java.lang.Object)
- */
- public final void removedService(ServiceReference reference, Object
service)
- {
- SimpleWebConsolePlugin plugin = this.plugin;
-
- if (tracker.getTrackingCount() == 0 && plugin != null)
- {
- plugin.unregister();
- this.plugin = null;
- }
-
- }
-}
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
deleted file mode 100644
index a177325ccd..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import jakarta.servlet.ServletException;
-
-import org.apache.felix.bundlerepository.Capability;
-import org.apache.felix.bundlerepository.Property;
-import org.apache.felix.bundlerepository.Reason;
-import org.apache.felix.bundlerepository.Repository;
-import org.apache.felix.bundlerepository.RepositoryAdmin;
-import org.apache.felix.bundlerepository.Requirement;
-import org.apache.felix.bundlerepository.Resolver;
-import org.apache.felix.bundlerepository.Resource;
-import org.apache.felix.utils.json.JSONWriter;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.Version;
-
-
-/**
- * This class provides a plugin for rendering the available OSGi Bundle
Repositories
- * and the resources they provide.
- */
-class FelixBundleRepositoryRenderHelper extends
AbstractBundleRepositoryRenderHelper
-{
-
- FelixBundleRepositoryRenderHelper( AbstractWebConsolePlugin logger,
BundleContext bundleContext )
- {
- super( logger, bundleContext, RepositoryAdmin.class.getName() );
- }
-
-
- @Override
- String getData( final String filter, final boolean details, Bundle[]
bundles )
- {
- RepositoryAdmin admin = ( RepositoryAdmin ) getRepositoryAdmin();
- if ( admin != null )
- {
- final StringWriter sw = new StringWriter();
- JSONWriter json = new JSONWriter(sw);
- try
- {
- json.object();
- json.key( "status" ); //$NON-NLS-1$
- json.value(true);
- json.key( "details" ); //$NON-NLS-1$
- json.value(details);
-
- final Repository repositories[] = admin.listRepositories();
- if ( repositories != null )
- {
- json.key("repositories");//$NON-NLS-1$
- json.array();
- for ( int i = 0; repositories != null && i <
repositories.length; i++ )
- {
- json.object();
- json.key( "lastModified"); //$NON-NLS-1$
- json.value( repositories[i].getLastModified());
- json.key( "name"); //$NON-NLS-1$
- json.value(repositories[i].getName() );
- json.key( "url"); //$NON-NLS-1$
- json.value( repositories[i].getURI() );
- json.endObject();
- }
- json.endArray();
- }
-
- Resource[] resources = admin.discoverResources( filter );
- if ( resources != null )
- {
- json.key("resources");//$NON-NLS-1$
- json.array();
- for ( int i = 0; i < resources.length; i++ )
- {
- toJSON( json, resources[i], bundles, details );
- }
- json.endArray();
- }
- json.endObject();
- json.flush();
-
- }
- catch ( IOException e )
- {
- logger.log( "Failed to serialize repository to JSON object.",
e );
- }
- catch ( Exception e )
- {
- logger.log( "Failed to parse filter '" + filter + "'", e );
- try
- {
- String reason = "filter=" + filter;
- if ( e.getMessage() != null )
- {
- reason = e.getMessage() + "(" + reason + ")";
- }
- json.key("error"); //$NON-NLS-1$
- json.value( reason );
- json.endObject();
- json.flush();
- }
- catch ( IOException je )
- {
- // ignore
- }
- }
- return sw.toString();
- }
-
- // fall back to no data
- return "{}"; //$NON-NLS-1$
- }
-
-
- @Override
- final void doAction( String action, String urlParam ) throws IOException,
ServletException
- {
- RepositoryAdmin admin = ( RepositoryAdmin ) getRepositoryAdmin();
- Repository[] repos = admin.listRepositories();
- Repository repo = getRepository( repos, urlParam );
-
- String uri = repo != null ? repo.getURI() : urlParam;
-
- if ( "delete".equals( action ) ) //$NON-NLS-1$
- {
- if ( !admin.removeRepository( uri ) )
- {
- throw new ServletException( "Failed to remove repository with
URL " + uri );
- }
- }
- else if ( "add".equals( action ) || "refresh".equals( action ) )
//$NON-NLS-1$ //$NON-NLS-2$
- {
- try
- {
- admin.addRepository( uri );
- }
- catch ( IOException e )
- {
- throw e;
- }
- catch ( Exception e )
- {
- throw new ServletException( "Failed to " + action + "
repository " + uri + ": " + e.toString() );
- }
-
- }
- }
-
-
- @Override
- final void doDeploy( String[] bundles, boolean start, boolean optional )
- {
- try
- {
- // check whether we have to do something
- if ( bundles == null || bundles.length == 0 )
- {
- logger.log( "No resources to deploy" );
- return;
- }
-
- RepositoryAdmin repoAdmin = ( RepositoryAdmin )
getRepositoryAdmin();
- Resolver resolver = repoAdmin.resolver();
-
- // prepare the deployment
- for ( int i = 0; i < bundles.length; i++ )
- {
- String bundle = bundles[i];
- if ( bundle == null || bundle.equals( "-" ) ) //$NON-NLS-1$
- {
- continue;
- }
-
- String filter = "(id=" + bundle + ")";
- Resource[] resources = repoAdmin.discoverResources( filter );
- if ( resources != null && resources.length > 0 )
- {
- resolver.add( resources[0] );
- }
- }
-
- FelixDeployer.deploy( resolver, logger, start, optional );
- }
- catch ( InvalidSyntaxException e )
- {
- throw new IllegalStateException( e );
- }
- }
-
-
- private final Repository getRepository( Repository[] repos, String
repositoryUrl )
- {
- if ( repositoryUrl == null || repositoryUrl.length() == 0 )
- {
- return null;
- }
-
- for ( int i = 0; i < repos.length; i++ )
- {
- if ( repositoryUrl.equals( repos[i].getURI() ) )
- {
- return repos[i];
- }
- }
-
- return null;
- }
-
-
- private final void toJSON( JSONWriter writer, Resource resource, Bundle[]
bundles, boolean details ) throws IOException
- {
- final String symbolicName = resource.getSymbolicName();
- final Version version = resource.getVersion();
- String installed = "";
- for ( int i = 0; symbolicName != null && installed.length() == 0 &&
bundles != null && i < bundles.length; i++ )
- {
- final Version ver = bundles[i].getVersion();
- if ( symbolicName.equals(bundles[i].getSymbolicName()))
- {
- installed = ver.toString();
- }
- }
- writer.object();
- writer.key( "id"); //$NON-NLS-1$
- writer.value(resource.getId() );
- writer.key( "presentationname" ); //$NON-NLS-1$
- writer.value(resource.getPresentationName() );
- writer.key( "symbolicname" ); //$NON-NLS-1$
- writer.value( symbolicName );
- writer.key( "url"); //$NON-NLS-1$
- writer.value(resource.getURI() );
- writer.key( "version" ); //$NON-NLS-1$
- writer.value(version );
- writer.key( "categories" ); //$NON-NLS-1$
- writer.value(resource.getCategories() );
- writer.key( "installed" ); //$NON-NLS-1$
- writer.value(installed );
-
- if ( details )
- {
- Capability[] caps = resource.getCapabilities();
- if ( caps != null )
- {
- writer.key("capabilities"); //$NON-NLS-1$
- writer.array();
- for ( int i = 0; i < caps.length; i++ )
- {
- writer.object();
- writer.key( "name" ); //$NON-NLS-1$
- writer.value(caps[i].getName() );
- writer.key( "properties" ); //$NON-NLS-1$
- toJSON( writer, caps[i].getProperties() );
- writer.endObject();
- }
- writer.endArray();
- }
- Requirement[] reqs = resource.getRequirements();
- if ( reqs != null )
- {
- writer.key("requirements"); //$NON-NLS-1$
- writer.array();
- for ( int i = 0; i < reqs.length; i++ )
- {
- writer.object();
- writer.key( "name" ); //$NON-NLS-1$
- writer.value(reqs[i].getName() );
- writer.key( "filter" ); //$NON-NLS-1$
- writer.value(reqs[i].getFilter() );
- writer.key( "optional" ); //$NON-NLS-1$
- writer.value(reqs[i].isOptional() );
- writer.endObject();
- }
- writer.endArray();
- }
-
- final RepositoryAdmin admin = ( RepositoryAdmin )
getRepositoryAdmin();
- Resolver resolver = admin.resolver();
- resolver.add( resource );
- resolver.resolve( Resolver.NO_OPTIONAL_RESOURCES );
- Resource[] required = resolver.getRequiredResources();
- if ( required != null )
- {
- writer.key("required"); //$NON-NLS-1$
- writer.array();
- for ( int i = 0; required != null && i < required.length; i++ )
- {
- toJSON( writer, required[i], bundles, false );
- }
- writer.endArray();
- }
- Resource[] optional = resolver.getOptionalResources();
- if ( optional != null )
- {
- writer.key("optional"); //$NON-NLS-1$
- writer.array();
- for ( int i = 0; optional != null && i < optional.length; i++ )
- {
- toJSON( writer, optional[i], bundles, false );
- }
- writer.endArray();
- }
- Reason[] unsatisfied = resolver.getUnsatisfiedRequirements();
- if ( unsatisfied != null)
- {
- writer.key("unsatisfied"); //$NON-NLS-1$
- writer.array();
- for ( int i = 0; unsatisfied != null && i <
unsatisfied.length; i++ )
- {
- writer.object();
- writer.key( "name" ); //$NON-NLS-1$
- writer.value(unsatisfied[i].getRequirement().getName() );
- writer.key( "filter" ); //$NON-NLS-1$
- writer.value(unsatisfied[i].getRequirement().getFilter() );
- writer.key( "optional" ); //$NON-NLS-1$
- writer.value(unsatisfied[i].getRequirement().isOptional()
);
-
- writer.endObject();
- }
- writer.endArray();
- }
- }
- writer.endObject();
- }
-
-
- private void toJSON( final JSONWriter writer, final Property[] props )
throws IOException
- {
- writer.object();
- for ( int i = 0; props != null && i < props.length; i++ )
- {
- writer.key(props[i].getName());
- writer.value(props[i].getValue());
- }
- writer.endObject();
- }
-}
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixDeployer.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixDeployer.java
deleted file mode 100644
index bfed872bf9..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixDeployer.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import org.apache.felix.bundlerepository.Reason;
-import org.apache.felix.bundlerepository.Resolver;
-import org.apache.felix.bundlerepository.Resource;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.osgi.service.log.LogService;
-
-
-class FelixDeployer implements Runnable
-{
-
- private final Resolver obrResolver;
-
- private final AbstractWebConsolePlugin logger;
-
- private final boolean startBundles;
-
- private final boolean optionalDependencies;
-
- static void deploy(Resolver obrResolver, AbstractWebConsolePlugin logger,
boolean startBundles,
- boolean optionalDependencies)
- {
- final FelixDeployer d = new FelixDeployer(obrResolver, logger,
startBundles, optionalDependencies);
- final Thread t = new Thread(d, "OBR Bundle Deployer (Apache Felix
API)");
- t.start();
- }
-
- private FelixDeployer(Resolver obrResolver, AbstractWebConsolePlugin
logger, boolean startBundles,
- boolean optionalDependencies)
- {
- this.obrResolver = obrResolver;
- this.logger = logger;
- this.startBundles = startBundles;
- this.optionalDependencies = optionalDependencies;
- }
-
- public void run()
- {
- int flags = 0;
- flags += (startBundles ? Resolver.START : 0);
- flags += (optionalDependencies ? 0 : Resolver.NO_OPTIONAL_RESOURCES);
- try
- {
- if ( obrResolver.resolve( flags ) )
- {
-
- logResource( "Installing Requested Resources",
obrResolver.getAddedResources() );
- logResource( "Installing Required Resources",
obrResolver.getRequiredResources() );
- logResource( "Installing Optional Resources",
obrResolver.getOptionalResources() );
-
- obrResolver.deploy( flags );
- }
- else
- {
- logRequirements( "Cannot Install requested bundles due to
unsatisfied requirements",
- obrResolver.getUnsatisfiedRequirements() );
- }
- }
- catch ( Exception ie )
- {
- logger.log( LogService.LOG_ERROR, "Cannot install bundles", ie );
- }
- }
-
-
- private void logResource( String message, Resource[] res )
- {
- if ( res != null && res.length > 0 )
- {
- logger.log( LogService.LOG_INFO, message );
- for ( int i = 0; i < res.length; i++ )
- {
- logger.log( LogService.LOG_INFO, " " + i + ": " +
res[i].getSymbolicName() + ", "
- + res[i].getVersion() );
- }
- }
- }
-
-
- private void logRequirements( String message, Reason[] reasons )
- {
- logger.log( LogService.LOG_ERROR, message );
- for ( int i = 0; reasons != null && i < reasons.length; i++ )
- {
- String moreInfo = reasons[i].getRequirement().getComment();
- if ( moreInfo == null )
- {
- moreInfo = reasons[i].getRequirement().getFilter().toString();
- }
- logger.log( LogService.LOG_ERROR, " " + i + ": " +
reasons[i].getRequirement().getName() + " (" + moreInfo + ")" );
- }
- }
-
-}
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
deleted file mode 100644
index f5cfdbe09d..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import jakarta.servlet.ServletException;
-
-import org.apache.felix.utils.json.JSONWriter;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-import org.osgi.service.obr.Capability;
-import org.osgi.service.obr.Repository;
-import org.osgi.service.obr.RepositoryAdmin;
-import org.osgi.service.obr.Requirement;
-import org.osgi.service.obr.Resolver;
-import org.osgi.service.obr.Resource;
-
-
-/**
- * This class provides a plugin for rendering the available OSGi Bundle
Repositories
- * and the resources they provide.
- */
-class OsgiBundleRepositoryRenderHelper extends
AbstractBundleRepositoryRenderHelper
-{
-
- OsgiBundleRepositoryRenderHelper( final AbstractWebConsolePlugin logger,
final BundleContext bundleContext )
- {
- super( logger, bundleContext, RepositoryAdmin.class.getName() );
- }
-
-
- @Override
- String getData( final String filter, final boolean details, Bundle[]
bundles )
- {
- RepositoryAdmin admin = ( RepositoryAdmin ) getRepositoryAdmin();
- if ( admin != null )
- {
- final StringWriter sw = new StringWriter();
- JSONWriter json = new JSONWriter(sw);
- try
- {
- json.object();
- json.key( "status" ); //$NON-NLS-1$
- json.value(true);
- json.key( "details" ); //$NON-NLS-1$
- json.value(details);
-
- final Repository repositories[] = admin.listRepositories();
- if ( repositories != null )
- {
- json.key("repositories"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; i < repositories.length; i++ )
- {
- json.object();
- json.key("lastModified"); //$NON-NLS-1$
- json.value(repositories[i].getLastModified());
- json.key("name"); //$NON-NLS-1$
- json.value(repositories[i].getName());
- json.key("url"); //$NON-NLS-1$
- json.value(repositories[i].getURL());
- json.endObject();
- }
- json.endArray();
- }
- Resource[] resources = admin.discoverResources( filter );
- if ( resources != null )
- {
- json.key("resources"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; i < resources.length; i++ )
- {
- toJSON( json, resources[i], bundles, details );
- }
- json.endArray();
- }
- json.endObject();
- json.flush();
- }
- catch ( IOException e )
- {
- logger.log( "Failed to serialize repository to JSON object.",
e );
- }
- catch ( Exception e )
- {
- logger.log( "Failed to parse filter '" + filter + "'", e );
- try
- {
- String reason = "filter=" + filter;
- if ( e.getMessage() != null )
- {
- reason = e.getMessage() + "(" + reason + ")";
- }
- json.key( "error" ); //$NON-NLS-1$
- json.value(reason);
- json.endObject();
- json.flush();
- }
- catch ( IOException je )
- {
- // ignore
- }
- }
-
- return sw.toString();
- }
-
- // fall back to no data
- return "{}"; //$NON-NLS-1$
- }
-
- @Override
- void doAction( String action, String urlParam ) throws IOException,
ServletException
- {
- RepositoryAdmin admin = ( RepositoryAdmin ) getRepositoryAdmin();
- Repository[] repos = admin.listRepositories();
- Repository repo = getRepository( repos, urlParam );
-
- URL uri = repo != null ? repo.getURL() : new URL( urlParam );
-
- if ( "delete".equals( action ) ) //$NON-NLS-1$
- {
- if ( !admin.removeRepository( uri ) )
- {
- throw new ServletException( "Failed to remove repository with
URL " + uri );
- }
- }
- else if ( "add".equals( action ) || "refresh".equals( action ) )
//$NON-NLS-1$ //$NON-NLS-2$
- {
- try
- {
- admin.addRepository( uri );
- }
- catch ( IOException e )
- {
- throw e;
- }
- catch ( Exception e )
- {
- throw new ServletException( "Failed to " + action + "
repository " + uri + ": " + e.toString() );
- }
-
- }
- }
-
-
- @Override
- final void doDeploy( String[] bundles, boolean start, boolean optional )
- {
- // check whether we have to do something
- if ( bundles == null || bundles.length == 0 )
- {
- logger.log( "No resources to deploy" );
- return;
- }
-
- RepositoryAdmin repoAdmin = ( RepositoryAdmin ) getRepositoryAdmin();
- Resolver resolver = repoAdmin.resolver();
-
- // prepare the deployment
- for ( int i = 0; i < bundles.length; i++ )
- {
- String bundle = bundles[i];
- if ( bundle == null || bundle.equals( "-" ) )
- {
- continue;
- }
-
- String filter = "(id=" + bundle + ")";
- Resource[] resources = repoAdmin.discoverResources( filter );
- if ( resources != null && resources.length > 0 )
- {
- resolver.add( resources[0] );
- }
- }
-
- OsgiDeployer.deploy( resolver, logger, start );
- }
-
-
- private final Repository getRepository( Repository[] repos, String
repositoryUrl )
- {
- if ( repositoryUrl == null || repositoryUrl.length() == 0 )
- {
- return null;
- }
-
- for ( int i = 0; i < repos.length; i++ )
- {
- if ( repositoryUrl.equals( repos[i].getURL().toString() ) )
- {
- return repos[i];
- }
- }
-
- return null;
- }
-
-
- private final void toJSON( JSONWriter json, Resource resource, Bundle[]
bundles, boolean details ) throws IOException
- {
- final String symbolicName = resource.getSymbolicName();
- final Version version = resource.getVersion();
- String installed = "";
- for ( int i = 0; symbolicName != null && installed.length() == 0 &&
bundles != null && i < bundles.length; i++ )
- {
- final Version ver = bundles[i].getVersion();
- if ( symbolicName.equals(bundles[i].getSymbolicName()))
- {
- installed = ver.toString();
- }
- }
- json.object();
- json.key("id"); //$NON-NLS-1$
- json.value(resource.getId());
- json.key("presentationname"); //$NON-NLS-1$
- json.value(resource.getPresentationName());
- json.key("symbolicname"); //$NON-NLS-1$
- json.value(symbolicName);
- json.key("url"); //$NON-NLS-1$
- json.value(resource.getURL());
- json.key("version"); //$NON-NLS-1$
- json.value(version);
- json.key("categories"); //$NON-NLS-1$
- json.value(resource.getCategories());
- json.key("installed"); //$NON-NLS-1$
- json.value(installed);
-
- if ( details )
- {
- Capability[] caps = resource.getCapabilities();
- if ( caps != null )
- {
- json.key("capabilities"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; i < caps.length; i++ )
- {
- json.key("name"); //$NON-NLS-1$
- json.value(caps[i].getName());
- json.key("properties"); //$NON-NLS-1$
- toJSON(json, caps[i].getProperties());
- }
- json.endArray();
- }
- Requirement[] reqs = resource.getRequirements();
- if ( caps != null )
- {
- json.key("requirements"); //$NON-NLS-1$
- json.array();
-
- for ( int i = 0; i < reqs.length; i++ )
- {
- json.key("name"); //$NON-NLS-1$
- json.value(reqs[i].getName());
- json.key("filter"); //$NON-NLS-1$
- json.value(reqs[i].getFilter());
- json.key("optional"); //$NON-NLS-1$
- json.value(reqs[i].isOptional());
- }
- json.endArray();
- }
-
- final RepositoryAdmin admin = ( RepositoryAdmin )
getRepositoryAdmin();
- Resolver resolver = admin.resolver();
- resolver.add( resource );
- resolver.resolve(); // (Resolver.NO_OPTIONAL_RESOURCES);
- Resource[] required = resolver.getRequiredResources();
- if ( required != null )
- {
- json.key("required"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; i < required.length; i++ )
- {
- toJSON( json, required[i], bundles, false );
- }
- json.endArray();
- }
- Resource[] optional = resolver.getOptionalResources();
- if ( optional != null )
- {
- json.key("optional"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; optional != null && i < optional.length; i++ )
- {
- toJSON( json, optional[i], bundles, false );
- }
- json.endArray();
- }
- Requirement/*Reason*/[] unsatisfied =
resolver.getUnsatisfiedRequirements();
- if ( unsatisfied != null )
- {
- json.key("unsatisfied"); //$NON-NLS-1$
- json.array();
- for ( int i = 0; i < unsatisfied.length; i++ )
- {
- json.key("name"); //$NON-NLS-1$
- json.value(unsatisfied[i].getName());
- json.key("filter"); //$NON-NLS-1$
- json.value(unsatisfied[i].getFilter());
- json.key("optional"); //$NON-NLS-1$
- json.value(unsatisfied[i].isOptional());
- }
- json.endArray();
- }
- }
- json.endObject();
- }
-
- private void toJSON( final JSONWriter writer, final Map props ) throws
IOException
- {
- writer.object();
- Iterator i = props.entrySet().iterator();
- while ( i.hasNext() )
- {
- Map.Entry entry = (Entry) i.next();
- writer.key(entry.getKey().toString());
- writer.value(entry.getValue());
- }
- writer.endObject();
- }
-}
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiDeployer.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiDeployer.java
deleted file mode 100644
index e20da6f859..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiDeployer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
-import org.osgi.service.log.LogService;
-import org.osgi.service.obr.Requirement;
-import org.osgi.service.obr.Resolver;
-import org.osgi.service.obr.Resource;
-
-
-class OsgiDeployer implements Runnable
-{
-
- private final Resolver obrResolver;
-
- private final AbstractWebConsolePlugin logger;
-
- private final boolean startBundles;
-
-
- OsgiDeployer( Resolver obrResolver, AbstractWebConsolePlugin logger,
boolean startBundles )
- {
- this.obrResolver = obrResolver;
- this.logger = logger;
- this.startBundles = startBundles;
- }
-
- static void deploy( Resolver obrResolver, AbstractWebConsolePlugin logger,
boolean startBundles )
- {
- final OsgiDeployer d = new OsgiDeployer( obrResolver, logger,
startBundles );
- final Thread t = new Thread( d, "OBR Bundle Deployer (OSGi API)" );
- t.start();
- }
-
- /**
- * @see java.lang.Runnable#run()
- */
- public void run()
- {
- try
- {
- if ( obrResolver.resolve() )
- {
-
- logResource( logger, "Installing Requested Resources",
obrResolver.getAddedResources() );
- logResource( logger, "Installing Required Resources",
obrResolver.getRequiredResources() );
- logResource( logger, "Installing Optional Resources",
obrResolver.getOptionalResources() );
-
- obrResolver.deploy( startBundles );
- }
- else
- {
- logRequirements( logger, "Cannot Install requested bundles due
to unsatisfied requirements",
- obrResolver.getUnsatisfiedRequirements() );
- }
- }
- catch ( Exception ie )
- {
- logger.log( LogService.LOG_ERROR, "Cannot install bundles", ie );
- }
- }
-
-
- public static void logResource( AbstractWebConsolePlugin logger, String
message, Resource[] res )
- {
- if ( res != null && res.length > 0 )
- {
- logger.log( LogService.LOG_INFO, message );
- for ( int i = 0; i < res.length; i++ )
- {
- logger.log( LogService.LOG_INFO, " " + i + ": " +
res[i].getSymbolicName() + ", "
- + res[i].getVersion() );
- }
- }
- }
-
-
- public static void logRequirements( AbstractWebConsolePlugin logger,
String message, Requirement[] reasons )
- {
- logger.log( LogService.LOG_ERROR, message );
- for ( int i = 0; reasons != null && i < reasons.length; i++ )
- {
- String moreInfo = reasons[i].getComment();
- if ( moreInfo == null )
- {
- moreInfo = reasons[i].getFilter().toString();
- }
- logger.log( LogService.LOG_ERROR, " " + i + ": " +
reasons[i].getName() + " (" + moreInfo + ")" );
- }
- }
-
-}
diff --git
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/WebConsolePlugin.java
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/WebConsolePlugin.java
deleted file mode 100644
index f0bd692bf1..0000000000
---
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/WebConsolePlugin.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * 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.felix.webconsole.plugins.obr.internal;
-
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.felix.webconsole.DefaultVariableResolver;
-import org.apache.felix.webconsole.SimpleWebConsolePlugin;
-import org.apache.felix.webconsole.WebConsoleUtil;
-
-
-/**
- * This class provides a plugin for rendering the available OSGi Bundle
Repositories
- * and the resources they provide.
- */
-class WebConsolePlugin extends SimpleWebConsolePlugin
-{
- private static final String LABEL = "obr"; //$NON-NLS-1$
- private static final String TITLE = "%obr.pluginTitle"; //$NON-NLS-1$
- private static final String CATEGORY = "OSGi"; //$NON-NLS-1$
- private static final String CSS[] = { "/" + LABEL + "/res/plugin.css" };
//$NON-NLS-1$ //$NON-NLS-2$
-
- // templates
- private final String TEMPLATE;
-
- private AbstractBundleRepositoryRenderHelper helper;
-
-
- /**
- *
- */
- public WebConsolePlugin()
- {
- super( LABEL, TITLE, CSS );
-
- // load templates
- TEMPLATE = readTemplateFile("/res/plugin.html"); //$NON-NLS-1$
- }
-
-
- public String getCategory()
- {
- return CATEGORY;
- }
-
-
- /**
- * @see org.apache.felix.webconsole.SimpleWebConsolePlugin#deactivate()
- */
- public void deactivate()
- {
- if ( helper != null )
- {
- helper.dispose();
- helper = null;
- }
-
- super.deactivate();
- }
-
-
- /**
- * @see
org.apache.felix.webconsole.AbstractWebConsolePlugin#renderContent(jakarta.servlet.http.HttpServletRequest,
jakarta.servlet.http.HttpServletResponse)
- */
- protected void renderContent( HttpServletRequest request,
HttpServletResponse response ) throws IOException
- {
- // prepare variables
- DefaultVariableResolver vars = ( ( DefaultVariableResolver )
WebConsoleUtil.getVariableResolver( request ) );
- vars.put( "__data__", getData( request ) ); //$NON-NLS-1$
-
- response.getWriter().print( TEMPLATE );
- }
-
-
- /**
- * @see
jakarta.servlet.http.HttpServlet#doPost(jakarta.servlet.http.HttpServletRequest,
jakarta.servlet.http.HttpServletResponse)
- */
- protected void doPost( HttpServletRequest request, HttpServletResponse
response ) throws ServletException,
- IOException
- {
- if ( !hasRepositoryAdmin() )
- {
- response.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"RepositoryAdmin service is missing" );
- return;
- }
-
- final String action = request.getParameter( "action" ); //$NON-NLS-1$
- final String deploy = request.getParameter( "deploy" ); //$NON-NLS-1$
- final String deploystart = request.getParameter( "deploystart" );
//$NON-NLS-1$
- final String optional = request.getParameter( "optional" );
//$NON-NLS-1$
-
- if ( action != null )
- {
- doAction( action, request.getParameter( "url" ) ); //$NON-NLS-1$
- response.getWriter().print( getData( request ) );
- return;
- }
-
- if ( deploy != null || deploystart != null )
- {
- doDeploy( request.getParameterValues( "bundle" ), deploystart !=
null, optional != null ); //$NON-NLS-1$
- doGet( request, response );
- return;
- }
-
- super.doPost( request, response );
- }
-
-
- AbstractBundleRepositoryRenderHelper getHelper()
- {
- if ( helper == null )
- {
- try
- {
- helper = new FelixBundleRepositoryRenderHelper( this,
getBundleContext() );
- }
- catch ( Throwable felixt )
- {
- // ClassNotFoundException, ClassDefNotFoundError
-
- try
- {
- helper = new OsgiBundleRepositoryRenderHelper( this,
getBundleContext() );
- }
- catch ( Throwable osgit )
- {
- // ClassNotFoundException, ClassDefNotFoundError
- }
- }
- }
-
- return helper;
- }
-
-
- private boolean hasRepositoryAdmin()
- {
- AbstractBundleRepositoryRenderHelper helper = getHelper();
- return helper != null && helper.hasRepositoryAdmin();
- }
-
-
- private String getData( final HttpServletRequest request )
- {
- AbstractBundleRepositoryRenderHelper helper = getHelper();
- if ( helper == null || !helper.hasRepositoryAdmin() )
- {
- return "{}"; //$NON-NLS-1$
- }
-
- RequestInfo info = new RequestInfo( request );
-
- final String filter;
- String list = info.getList();
- if ( list != null )
- {
- if ( "-".equals( list ) ) //$NON-NLS-1$
- {
- StringBuffer sb = new StringBuffer( "(!(|" ); //$NON-NLS-1$
- for ( int c = 0; c < 26; c++ )
- {
- sb.append( "(presentationname=" ).append( ( char ) ( 'a' +
c ) ) //$NON-NLS-1$
- .append( "*)(presentationname=" ).append( ( char ) ( 'A'
+ c ) ) //$NON-NLS-1$
- .append( "*)" ); //$NON-NLS-1$
- }
- sb.append( "))" ); //$NON-NLS-1$
- filter = sb.toString();
- }
- else
- {
- filter = "(|(presentationname=" + list.toLowerCase()
//$NON-NLS-1$
- + "*)(presentationname=" + list.toUpperCase() + "*))";
//$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- else
- {
- String query = info.getQuery();
- if ( query != null )
- {
- if ( query.indexOf( '=' ) > 0 )
- {
- if ( query.startsWith( "(" ) ) //$NON-NLS-1$
- {
- filter = query;
- }
- else
- {
- filter = "(" + query + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- else
- {
- filter = "(|(presentationame=*" + query +
"*)(symbolicname=*" + query + "*))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- else
- {
- StringBuffer sb = new StringBuffer( "(&" ); //$NON-NLS-1$
- for ( Enumeration e = request.getParameterNames();
e.hasMoreElements(); )
- {
- String k = ( String ) e.nextElement();
- String v = request.getParameter( k );
- if ( v != null && v.length() > 0
- && !"details".equals( k ) //$NON-NLS-1$
- && !"deploy".equals( k ) //$NON-NLS-1$
- && !"deploystart".equals( k ) //$NON-NLS-1$
- && !"bundle".equals( k ) //$NON-NLS-1$
- && !"optional".equals( k ) ) //$NON-NLS-1$
- {
- sb.append( '(' ).append( k ).append( '=' ).append( v
).append( ')' );
- }
- }
- sb.append( ')' );
- filter = (sb.length() > 3) ? sb.toString() : null;
- }
- }
-
- return helper.getData( filter, info.showDetails(),
getBundleContext().getBundles() );
- }
-
-
- private void doAction( String action, String urlParam ) throws
IOException, ServletException
- {
- AbstractBundleRepositoryRenderHelper helper = getHelper();
- if ( helper != null )
- {
- helper.doAction( action, urlParam );
- }
- }
-
-
- private void doDeploy( String[] bundles, boolean start, boolean optional )
- {
- AbstractBundleRepositoryRenderHelper helper = getHelper();
- if ( helper != null )
- {
- helper.doDeploy( bundles, start, optional );
- }
- }
-
- private static class RequestInfo {
-
- private final HttpServletRequest request;
-
- private boolean details;
- private String query;
- private String list;
-
-
- RequestInfo( final HttpServletRequest request )
- {
- this.request = request;
- }
-
-
- boolean showDetails()
- {
- getQuery();
- return details;
- }
-
-
- String getQuery()
- {
- if ( query == null )
- {
- String query = WebConsoleUtil.urlDecode( request.getParameter(
"query" ) ); //$NON-NLS-1$
- boolean details = false;
- if ( query == null && request.getPathInfo().length() > 5 )
- {
- // cut off "/obr/" prefix (might want to use getTitle ??)
- String path = request.getPathInfo().substring( 5 );
- int slash = path.indexOf( '/' );
- if ( slash < 0 )
- {
- // symbolic name only, version ??
- query = "(symbolicname=" + path + ")"; //$NON-NLS-1$
//$NON-NLS-2$
- }
- else
- {
- query = "(&(symbolicname=" + path.substring( 0, slash
) //$NON-NLS-1$
- + ")(version=" + path.substring( slash + 1 ) +
"))"; //$NON-NLS-1$ //$NON-NLS-2$
- details = true;
- }
- }
-
- this.query = query;
- this.details = details;
- }
- return query;
- }
-
-
- String getList()
- {
- if ( list == null )
- {
- list = WebConsoleUtil.urlDecode( request.getParameter( "list"
) ); //$NON-NLS-1$
- if ( list == null &&
!request.getParameterNames().hasMoreElements() && getQuery() == null )
- {
- list = "a"; //$NON-NLS-1$
- }
- }
- return list;
- }
- }
-}
diff --git
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle.properties
b/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 78812a5c85..0000000000
--- a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-
-#
-# Web Console strings for reference all strings here are commented.
-# This file may be used to produce a translation of the strings
-#
-# Note that properties files are ISO-8859-1 encoded. To provide translations
-# for languages requiring different character encodings, you may use the
-# native2ascii Maven Plugin from
http://mojo.codehaus.org/native2ascii-maven-plugin/
-# to translate the natively encoded files to ISO-8859-1 during bundle build
-#
-# Translations requiring non-ISO-8859-1 encoding are placed in the
-# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
-# plugin while building the bundle
-#
-
-# OBR Plugin
-obr.pluginTitle=OSGi Repository
-obr.status.ok=The Apache Bundle Repository service is up and running.
-obr.status.no=The Apache Bundle Repository service is not available!
-obr.version.select=Select Version...
-obr.repo.title=Bundle Repositories
-obr.action.add=Add
-obr.action.search=Search
-obr.action.search.description=Enter word contained in bundle presentation \
- and/or symbolic name or a valid OSGi Filter Expression
-obr.action.deploy=Deploy Selected
-obr.action.deploystart=Deploy and Start Selected
-obr.repo.name=Name
-obr.repo.url=URL
-obr.repo.lastModified=Last Modified
-obr.repo.actions=Actions
-obr.res.title=Available Resources
-obr.res.name=Resource Name
-obr.res.installedVer=Installed Version
-obr.error=Error Filtering Resources
diff --git
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
b/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
deleted file mode 100644
index 89b6aaecf4..0000000000
---
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-
-#
-# Web Console strings for reference all strings here are commented.
-# This file may be used to produce a translation of the strings
-#
-# Note that properties files are ISO-8859-1 encoded. To provide translations
-# for languages requiring different character encodings, you may use the
-# native2ascii Maven Plugin from
http://mojo.codehaus.org/native2ascii-maven-plugin/
-# to translate the natively encoded files to ISO-8859-1 during bundle build
-#
-# Translations requiring non-ISO-8859-1 encoding are placed in the
-# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
-# plugin while building the bundle
-# native2ascii -encoding utf-8 bundle_bg.raw_properties bundle_bg.properties
-
-# OBR Plugin
-obr.pluginTitle=OSGi Хранилище
-obr.status.ok=Apache Bundle Repository услъгата е достъпна.
-obr.status.no=Нуждаете се от Apache Bundle Repository услугата за да се
възползвате от тази функционалност!
-obr.version.select=Изберете версия...
-obr.repo.title=Бъндъл хранилище
-obr.action.add=Добавяне
-obr.action.search=Търсене
-obr.action.search.description=Въведе част от презентацията на бъндъла (име,
описание, версия ...), \
- или валиден OSGi филтър
-obr.action.deploy=Инсталиране на избраните
-obr.action.deploystart=Инсталиране и стартиране на избраните
-obr.repo.name=Име
-obr.repo.url=Адрес
-obr.repo.lastModified=Последна промяна
-obr.repo.actions=Действия
-obr.res.title=Достъпни ресурси
-obr.res.name=Име на ресурса
-obr.res.installedVer=Инсталирана версия
-obr.error=Грешка при филтриране на ресурсите
diff --git
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_de.properties
b/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_de.properties
deleted file mode 100644
index e99dfb5509..0000000000
---
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_de.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-#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.
-
-#
-# Web Console strings for reference all strings here are commented.
-# This file may be used to produce a translation of the strings
-#
-# Note that properties files are ISO-8859-1 encoded. To provide translations
-# for languages requiring different character encodings, you may use the
-# native2ascii Maven Plugin from
http://mojo.codehaus.org/native2ascii-maven-plugin/
-# to translate the natively encoded files to ISO-8859-1 during bundle build
-#
-# Translations requiring non-ISO-8859-1 encoding are placed in the
-# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
-# plugin while building the bundle
-#
-
-# OBR Plugin
-obr.pluginTitle=OSGi Repository
-obr.status.ok=Der Apache Bundle Repository Service ist aktiv und bereit.
-obr.status.no=Der Apache Bundle Repository Service ist nicht aktiv!
-obr.version.select=Wähle Version...
-obr.repo.title=Bundle Repositories
-obr.action.add=Hinzufügen
-obr.action.search=Suchen
-obr.action.search.description=Geben Sie einen Teil des Präsentations- oder \
- symoblischen Namens der gesuchten Bundles oder einen gültigen OSGi \
- Filter Ausdruck
-obr.action.deploy=Ausgewählte Installieren
-obr.action.deploystart=Ausgewählte Installieren und Starten
-obr.repo.name=Name
-obr.repo.url=URL
-obr.repo.lastModified=Letzte Änderung
-obr.repo.actions=Aktionen
-obr.res.title=Verfügbare Resourcen
-obr.res.name=Resource Name
-obr.res.installedVer=Installierte Version
-obr.error=Fehler bei der Auswahl der Resourcen
diff --git
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
b/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
deleted file mode 100644
index f3cebef6ba..0000000000
---
a/webconsole-plugins/obr/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#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.
-
-#
-# Web Console strings for reference all strings here are commented.
-# This file may be used to produce a translation of the strings
-#
-# Note that properties files are ISO-8859-1 encoded. To provide translations
-# for languages requiring different character encodings, you may use the
-# native2ascii Maven Plugin from
http://mojo.codehaus.org/native2ascii-maven-plugin/
-# to translate the natively encoded files to ISO-8859-1 during bundle build
-#
-# Translations requiring non-ISO-8859-1 encoding are placed in the
-# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
-# plugin while building the bundle
-#
-
-# OBR Plugin
-obr.pluginTitle=Хранилище OSGi
-obr.status.ok=Сервис Apache Bundle Repository запущен и работает.
-obr.status.no=Сервис Apache Bundle Repository не найден!
-obr.version.select=Выберите версию...
-obr.repo.title=Хранилище модулей
-obr.action.add=Добавить
-obr.action.search=Поиск
-obr.action.search.description=Введите слово, содержащееся в описании модуля
(или в имени, версии и т. д.) \
- или правильный OSGi фильтр
-obr.action.deploy=Установить выбранное
-obr.action.deploystart=Установить и запустить выбранное
-obr.repo.name=Имя
-obr.repo.url=Адрес
-obr.repo.lastModified=Последнее изменение
-obr.repo.actions=Действия
-obr.res.title=Доступные ресурсы
-obr.res.name=Имя ресурса
-obr.res.installedVer=Установленная версия
-obr.error=Ошибка фильтрации ресурсов
diff --git a/webconsole-plugins/obr/src/main/resources/res/plugin.css
b/webconsole-plugins/obr/src/main/resources/res/plugin.css
deleted file mode 100644
index 8517779521..0000000000
--- a/webconsole-plugins/obr/src/main/resources/res/plugin.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-label {
- font-family: Verdana, Arial, sans-serif;
- font-size: 1em;
- font-style: normal;
- font-weight: normal;
-}
\ No newline at end of file
diff --git a/webconsole-plugins/obr/src/main/resources/res/plugin.html
b/webconsole-plugins/obr/src/main/resources/res/plugin.html
deleted file mode 100644
index 65f6e9d6ca..0000000000
--- a/webconsole-plugins/obr/src/main/resources/res/plugin.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<script type="text/javascript" src="${pluginRoot}/res/plugin.js"></script>
-<script type="text/javascript">
-// <![CDATA[
-var i18n = {
- status_ok : '${obr.status.ok}',
- status_no : '${obr.status.no}',
- selectVersion : '${obr.version.select}',
- error : '${obr.error}'
-}
-var obrData = ${__data__};
-// ]]>
-</script>
-
-<p class="statline">${obr.status.ok}</p>
-
-<div id="ifStatusOK" class="ui-helper-hidden">
-
-<div class="ui-widget-header ui-corner-top buttonGroup">
- <span style="float: left; margin-left: 1em">${obr.repo.title}</span>
- <input style="width: 50%" type="text" id="addRepoUri" />
- <button id="addRepoBtn">${obr.action.add}</button>
-</div>
-
-<table id="repoTable" class="nicetable">
- <thead>
- <tr>
- <th class="col_Name">${obr.repo.name}</th>
- <th class="col_URL">${obr.repo.url}</th>
- <th class="col_lastMod">${obr.repo.lastModified}</th>
- <th class="col_Actions">${obr.repo.actions}</th>
- </tr>
- </thead>
- <tbody> <!-- template: will be replaced dynamically by JS -->
- <tr>
- <td>name</td>
- <td>url</td>
- <td>date</td>
- <td>
- <ul class="icons ui-widget">
- <li class="dynhover"
title="${refresh}"><span class="ui-icon ui-icon-refresh"> </span></li>
- <li class="dynhover"
title="${delete}"><span class="ui-icon ui-icon-trash"> </span></li>
- </ul>
- </td>
- </tr>
- </tbody>
-</table>
-
-<br/>
-
-<div class="ui-widget-header ui-corner-top buttonGroup">
- <span style="float: left; margin-left: 1em">${obr.res.title}</span>
- <span>
- <a href="${pluginRoot}?list=a">A</a>
- <a href="${pluginRoot}?list=b">B</a>
- <a href="${pluginRoot}?list=c">C</a>
- <a href="${pluginRoot}?list=d">D</a>
- <a href="${pluginRoot}?list=e">E</a>
- <a href="${pluginRoot}?list=f">F</a>
- <a href="${pluginRoot}?list=g">G</a>
- <a href="${pluginRoot}?list=h">H</a>
- <a href="${pluginRoot}?list=i">I</a>
- <a href="${pluginRoot}?list=j">J</a>
- <a href="${pluginRoot}?list=k">K</a>
- <a href="${pluginRoot}?list=l">L</a>
- <a href="${pluginRoot}?list=m">M</a>
- <a href="${pluginRoot}?list=n">N</a>
- <a href="${pluginRoot}?list=o">O</a>
- <a href="${pluginRoot}?list=p">P</a>
- <a href="${pluginRoot}?list=q">Q</a>
- <a href="${pluginRoot}?list=r">R</a>
- <a href="${pluginRoot}?list=s">S</a>
- <a href="${pluginRoot}?list=t">T</a>
- <a href="${pluginRoot}?list=u">U</a>
- <a href="${pluginRoot}?list=v">V</a>
- <a href="${pluginRoot}?list=w">W</a>
- <a href="${pluginRoot}?list=x">X</a>
- <a href="${pluginRoot}?list=y">Y</a>
- <a href="${pluginRoot}?list=z">Z</a>
- <a href="${pluginRoot}">?</a>
- </span>
- <input type="text" id="searchField"
title="${obr.action.search.description}"/>
- <button id="searchBtn">${obr.action.search}</button>
-</div>
-
-<table id="resTable" class="nicetable">
- <thead>
- <tr>
- <th class="col_ResName">${obr.res.name}</th>
- <th class="col_VersionInst">${obr.res.installedVer}</th>
- </tr>
- </thead>
- <tbody>
- <tr><td colspan="2">dummy</td></tr>
- </tbody>
-</table>
-
-<table id="detailsTable" class="nicetable ui-helper-hidden">
- <tbody id="detailsTableBody">
- </tbody>
-</table>
-
-<br/>
-
-</div> <!-- ifStatusOK -->
\ No newline at end of file
diff --git a/webconsole-plugins/obr/src/main/resources/res/plugin.js
b/webconsole-plugins/obr/src/main/resources/res/plugin.js
deleted file mode 100644
index bfa3876d60..0000000000
--- a/webconsole-plugins/obr/src/main/resources/res/plugin.js
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * 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.
- */
-
-var repoTable = false;
-var repoTableTemplate = false;
-var addRepoUri = false;
-var resTable = false;
-var searchField = false;
-var ifStatusOK = false;
-
-//This prototype is provided by the Mozilla foundation and
-//is distributed under the MIT license.
-//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
-if (!Array.prototype.map)
-{
- Array.prototype.map = function(fun /*, thisp*/)
- {
- var len = this.length;
- if (typeof fun != "function")
- throw new TypeError();
-
- var res = new Array(len);
- var thisp = arguments[1];
- for (var i = 0; i < len; i++)
- {
- if (i in this)
- res[i] = fun.call(thisp, this[i], i, this);
- }
-
- return res;
- };
-}
-
-var uid = 0;
-function guid() {
- uid = uid + 1;
- return (0x10000 + uid).toString(16).substring(1) +
(((1+Math.random())*0x10000)|0).toString(16).substring(1);
-}
-
-/* displays a date in the user's local timezone */
-function localTm(time) {
- return (time ? new Date(time) : new Date()).toLocaleString();
-}
-
-function doRepoAction(action, url) {
- if ( !url ) {
- Xalert('Invalid URI: ' + url, 'Error');
- } else {
- $.post(pluginRoot, {
- 'action' : action,
- 'url' : url
- }, renderData, 'json');
- }
-}
-
-function showDetails( symbolicname, version ) {
- window.location.href = pluginRoot + '/' + symbolicname + '/' + version;
-}
-
-function showVersions( symbolicname ) {
- var _id = symbolicname.replace(/\./g, '_');
- $("#block" + _id).append("<div id='pluginInlineVersions" + _id + "'
style='margin-left: 4em'><ul/></div>");
- $("#img" + _id).each(function() {
- $(this).
- removeClass('ui-icon-triangle-1-e').//right
- addClass('ui-icon-triangle-1-s');//down
- });
- $("#entry" + _id).each(function() {
- $(this).
- unbind('click').
- click(function() {hideVersions(symbolicname)}).
- attr("title", "Hide Versions");
- });
- var versions = [];
- for (var i in obrData.resources ) {
- if (obrData.resources[i].symbolicname == symbolicname) {
- versions.push(obrData.resources[i].version);
- }
- }
- versions.sort();
- for (var i in versions) {
- var txt = "<li><a href='javascript: showDetails(\"" + symbolicname +
"\",\"" + versions[i] + "\")'>" + versions[i] + "</a></li>";
- $("#pluginInlineVersions" + _id + " > ul").append(txt);
- }
-}
-
-function hideVersions( symbolicname ) {
- var _id = symbolicname.replace(/\./g, '_');
- $("#img" + _id).each(function() {
- $(this).
- removeClass('ui-icon-triangle-1-s').//down
- addClass('ui-icon-triangle-1-e');//right
- });
- $("#pluginInlineVersions" + _id).each(function() {
- $(this).
- remove();
- });
- $("#entry" + _id).each(function() {
- $(this).
- unbind('click').
- click(function() {showVersions(symbolicname)}).
- attr("title", "Show Versions");
- });
-}
-
-function renderResource(res) {
- // proceed with resource
- var _id = res.symbolicname.replace(/\./g, '_');
- var _tr = resTable.find('#row' + _id);
-
- if (_tr.length == 0) { // not created yet, create it
- var blockElement = createElement('span', '', {
- id: 'block' + _id
- });
- var titleElement = createElement('span', '', {
- id: 'entry' + _id,
- title: "Show Versions"
- });
- var inputElement = createElement('span', 'ui-icon
ui-icon-triangle-1-e', {
- id: 'img' + _id,
- style: {display: "inline-block"}
- });
- blockElement.appendChild(titleElement);
- titleElement.appendChild(inputElement);
- titleElement.appendChild(text(" "));
- if (res.presentationname) {
- titleElement.appendChild(text(res.presentationname));
- titleElement.appendChild(text(" ("));
- titleElement.appendChild(text(res.symbolicname));
- titleElement.appendChild(text(")"));
- } else {
- titleElement.appendChild(text(res.symbolicname));
- }
- $(titleElement).click(function() {showVersions(res.symbolicname)});
-
- _tr = tr( null, { 'id' : 'row' + _id } , [
- td( null, null, [ blockElement ] ),
- td( null, null, [ text(res.installed) ] )
- ]);
- resTable.append( _tr );
- }
-}
-
-function getCapabilitiesByName(res, name) {
- var caps = [];
- for (var v in res.capabilities) {
- if (res.capabilities[v].name == name) {
- caps.push(res.capabilities[v]);
- }
- }
- return caps;
-}
-
-function getRequirementsByName(res, name) {
- var caps = [];
- for (var v in res.requirements) {
- if (res.requirements[v].name == name) {
- caps.push(res.requirements[v]);
- }
- }
- return caps;
-}
-
-function createDetailedTable(enclosing, name, headers, rows, callback) {
- if (rows && rows.length > 0) {
- var uuid = guid();
- var title = createElement('span', null, null, [
- createElement('span', 'ui-icon
ui-icon-triangle-1-e', { id: "img"+uuid, style: {display: "inline-block"} }),
- text(" "),
- text(name)
- ]);
- enclosing.append(tr(null, null, [
- td(null, null, [ title ]),
- td(null, null, [ createElement('table', 'nicetable ui-widget
ui-helper-hidden', { id: "alt1"+uuid }, [
- createElement('thead', null, null, [
- tr(null, null, headers.map(function(x) {
- return th('ui-widget-header', null,
[text(x)]);
- }))
- ]),
- createElement('tbody', null, null,
- rows.map(function(x) {
- var values = callback(x);
- var tds = values.map(function(x) {
- return td(null, null, [x]);
- });
- return tr(null, null, tds);
- })
- )
- ]),
- createElement('span', null, { id: "alt2"+uuid }, [
- text(rows.length)
- ])
- ])
- ]));
- $(title).
- unbind('click').
- click(function(event) {
- event.preventDefault();
- $("#img"+uuid).toggleClass('ui-icon-triangle-1-s').//down
- toggleClass('ui-icon-triangle-1-e');//right
- $("#alt1"+uuid).toggle();
- $("#alt2"+uuid).toggle();
- });
- }
-}
-
-function trim(stringToTrim) {
- return stringToTrim.replace(/^\s+|\s+$/g,"");
-}
-
-function parseSimpleFilter(filter) {
- filter = filter.substring(1, filter.length-1);
- var start = 0;
- var pos = 0;
- var c = filter.charAt(pos);
- while (c != '~' && c != '<' && c != '>' && c != '=' && c != '(' && c !=
')') {
- if (c == '<' && filterChars[pos+1] == '*') {
- break;
- }
- if (c == '*' && filterChars[pos+1] == '>') {
- break;
- }
- pos++;
- c = filter.charAt(pos);
- }
- if (pos == start) {
- throw ("Missing attr: " + filter.substring(pos));
- }
-
- var attr = trim(filter.substring(start, pos));
- var oper = filter.substring(pos, pos+2);
- var value;
- if (oper == '*>' || oper == '~=' || oper == '>=' || oper == '<=' || oper
== '<*') {
- value = trim(filter.substring(pos+2));
- if (value == '') {
- throw ("Missing value: " + filter.substring(pos));
- }
-
- return { operator: oper, operands: [ attr, value ]};
- } else {
- if (c != '=') {
- throw ("Invalid operator: " + filter.substring(pos));
- }
- oper = '=';
- value = filter.substring(pos+1);
- if (value == '*' ) {
- return { operator: '=*', operands: [ attr ]};
- }
- return { operator: '=', operands: [ attr, value ]};
- }
-}
-
-function parseFilter(filter) {
- if (filter.charAt(0) != "(" || filter.charAt(filter.length-1) != ")") {
- throw "Wrong parenthesis: " + filter;
- }
- if (filter.charAt(1) == "!") {
- return { operator: filter.charAt(1), operands: [
parseFilter(filter.substring(2, filter.length-1)) ] };
- }
- if (filter.charAt(1) == "|" || filter.charAt(1) == "&") {
- var inner = filter.substring(2, filter.length-1);
- var flts =
inner.match(/\([^\(\)]*(\([^\(\)]*(\([^\(\)]*(\([^\(\)]*\))*[^\(\)]*\))*[^\(\)]*\))*[^\(\)]*\)/g);
- return { operator: filter.charAt(1), operands: flts.map(function(x) {
return parseFilter(x); }) };
- }
- return parseSimpleFilter(filter);
-}
-
-function simplify(filter) {
- if (filter.operator == '&' || filter.operator == '|') {
- filter.operands = filter.operands.map(function(x) { return
simplify(x); });
- } else if (filter.operator == '!') {
- if (filter.operands[0].operator == '<=') {
- filter.operator = '>';
- filter.operands = filter.operands[0].operands;
- } else if (filter.operands[0].operator == '>=') {
- filter.operator = '<';
- filter.operands = filter.operands[0].operands;
- }
- }
- return filter;
-}
-
-function addRow(tbody, key, value) {
- if (value) {
- tbody.append( tr(null, null, [
- td(null, null, [ text(key) ]),
- td(null, null, [ text(value) ])
- ]));
- }
-}
-
-function renderDetailedResource(res) {
- var tbody = $('#detailsTableBody');
-
- tbody.append( tr(null, null, [
- th('ui-widget-header', null, [
- text("Resource")
- ]),
- th('ui-widget-header', null, [
- createElement('form', 'button-group', { method: "post"}, [
- createElement('input', null, { type: "hidden", name: "bundle",
value: res.id}),
- createElement('input', 'ui-state-default ui-corner-all', {
type: "submit", name: "deploy", value: "Deploy" }, [ text("dummy")]),
- createElement('input', 'ui-state-default ui-corner-all', {
type: "submit", name: "deploystart", value: "Deploy and Start" }, [
text("dummy")]),
- text(" "),
- createElement('input', 'ui-state-default ui-corner-all', { id:
"optional", type: "checkbox", name: "optional" }),
- text(" "),
- createElement('label', 'ui-widget', { 'for': "optional" }, [
text("deploy optional dependencies") ])
- ])
- ])
- ]));
-
- addRow(tbody, "Name", res.presentationname);
- addRow(tbody, "Description", res.description);
- addRow(tbody, "Symbolic name", res.symbolicname);
- addRow(tbody, "Version", res.version);
- addRow(tbody, "URI", res.uri);
- addRow(tbody, "Documentation", res.documentation);
- addRow(tbody, "Javadoc", res.javadoc);
- addRow(tbody, "Source", res.source);
- addRow(tbody, "License", res.license);
- addRow(tbody, "Copyright", res.copyright);
- addRow(tbody, "Size", res.size);
-
- // Exported packages
- createDetailedTable(tbody, "Exported packages", ["Package", "Version"],
- getCapabilitiesByName(res,
"package").sort(function(a,b) {
- var pa = a.properties['package'], pb =
b.properties['package']; return pa == pb ? 0 : pa < pb ? -1 : +1;
- }),
- function(p) {
- return [ text(p.properties['package']),
text(p.properties['version']) ];
- });
- // Exported services
- createDetailedTable(tbody, "Exported services", ["Service"],
getCapabilitiesByName(res, "service"), function(p) {
- return [ text(p.properties['service']) ];
- });
- // Imported packages
- createDetailedTable(tbody, "Imported packages", ["Package", "Version",
"Optional"], getRequirementsByName(res, "package"), function(p) {
- var f = parseFilter(p.filter);
- simplify(f);
- var n, vmin = "[0.0.0", vmax = "infinity)";
- if (f.operator == '&') {
- for (var i in f.operands) {
- var fi = f.operands[i];
- if (fi.operands[0] == 'package' &&
fi.operator == '=') {
- n = fi.operands[1];
- }
- if (fi.operands[0] == 'version') {
- if (fi.operator == '>=') {
- vmin = '[' + fi.operands[1];
- }
- if (fi.operator == '>') {
- vmin = '(' + fi.operands[1];
- }
- if (fi.operator == '<=') {
- vmax = fi.operands[1] + "]";
- }
- if (fi.operator == '<') {
- vmax = fi.operands[1] + ")";
- }
- }
- }
- }
- return [ text(n ? n : p.filter), text(vmin + ", "
+ vmax), text(p.optional) ];
- });
- // Imported bundles
- createDetailedTable(tbody, "Imported bundles", ["Bundle", "Version",
"Optional"], getRequirementsByName(res, "bundle"), function(p) {
- return [ text(p.filter), text(""),
text(p.optional) ];
- });
- // Imported services
- createDetailedTable(tbody, "Imported services", ["Service", "Optional"],
getRequirementsByName(res, "service"), function(p) {
- return [ text(p.filter), text(p.optional) ];
- });
- // Required dependencies
- createDetailedTable(tbody, "Dependencies", ["Name", "Version"],
res.required, function(p) {
- var a = createElement('a', null, { href:
(pluginRoot + '/' + p.symbolicname + '/' + p.version) });
- a.appendChild(text(p.presentationname ?
p.presentationname : p.symbolicname));
- return [ a, text(p.version) ];
- });
- // Optional dependencies
- createDetailedTable(tbody, "Optional Dependencies", ["Name", "Version"],
res.optional, function(p) {
- var a = createElement('a', null, { href:
(pluginRoot + '/' + p.symbolicname + '/' + p.version) });
- a.appendChild(text(p.presentationname ?
p.presentationname : p.symbolicname));
- return [ a, text(p.version) ];
- });
- // Unsatisfied requirements
- createDetailedTable(tbody, "Unsatisfied Requirements", ["Requirement",
"Optional"], res.unsatisfied, function(p) {
- return [ text(p.filter), text(p.optional) ];
- });
-
-// $('#detailsTableBody').append( tr(null, null, [ th('ui-widget-header', {
colspan: 2 }, [ text("Resource") ]) ]) );
-// $('#detailsTableBody').append( tbody );
-}
-
-function renderRepository(repo) {
- var _tr = repoTableTemplate.clone();
- _tr.find('td:eq(0)').text( repo.name );
- _tr.find('td:eq(1)').text( repo.url );
- _tr.find('td:eq(2)').text( localTm(repo.lastModified) );
- _tr.find('li:eq(0)').click(function() {
- doRepoAction('refresh', repo.url);
- });
- _tr.find('li:eq(1)').click(function() {
- doRepoAction('delete', repo.url);
- });
- repoTable.append(_tr);
-}
-
-function renderData(data) {
- repoTable.empty();
- resTable.empty();
- $.extend ( obrData, data );
- if ( obrData.status ) {
- $('.statline').html(i18n.status_ok);
- ifStatusOK.removeClass('ui-helper-hidden');
- for (var i in obrData.repositories ) {
- renderRepository( obrData.repositories[i] );
- }
- if (obrData.details) {
- $('#resTable').addClass('ui-helper-hidden');
- $('#detailsTable').removeClass('ui-helper-hidden');
- for (var i in obrData.resources ) {
- renderDetailedResource( obrData.resources[i] );
- }
- } else if (obrData.resources) {
- for (var i in obrData.resources ) {
- renderResource( obrData.resources[i] );
- }
- } else if (obrData.error) {
- _tr = tr( "ui-state-error", null , [
- td( "ui-state-error-text", { 'colspan': '2' },
- [ text(i18n.error + ": " + obrData.error) ] )
- ]);
- resTable.append( _tr );
- }
- } else {
- $('.statline').html(i18n.status_no);
- ifStatusOK.addClass('ui-helper-hidden');
- }
-}
-
-
-$.extend({
- getUrlVars: function(){
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?')
+ 1).split('&');
- for(var i = 0; i < hashes.length; i++)
- {
- var j = hashes[i].indexOf('=');
- if (j > 0) {
- var k = hashes[i].slice(0, j);
- var v = hashes[i].slice(j + 1);
- vars.push(k);
- vars[k] = v;
- } else {
- vars.push(hashes[i]);
- vars[hashes[i]] = true;
- }
- }
- return vars;
- },
- getUrlVar: function(name){
- return $.getUrlVars()[name];
- }
-});
-
-$(document).ready( function() {
- repoTable = $('#repoTable tbody');
- repoTableTemplate = repoTable.find('tr').clone();
- addRepoUri = $('#addRepoUri');
- resTable = $('#resTable tbody').empty();
- searchField = $('#searchField');
- ifStatusOK = $('#ifStatusOK');
-
- var query = $.getUrlVar('query');
- if (query) {
- searchField.val(decodeURIComponent(query));
- }
-
- $('#addRepoBtn').click(function(event) {
- event.preventDefault();
- doRepoAction('add', addRepoUri.val());
- });
- $('#searchBtn').click(function(event) {
- event.preventDefault();
- window.location.href = pluginRoot + '?query=' +
encodeURIComponent(searchField.val());
- });
- searchField.keypress(function(event) {
- if (event.keyCode == 13) {
- event.preventDefault();
- $('#searchBtn').click();
- }
- });
-
- renderData();
- initStaticWidgets();
-});
-
