Author: [email protected]
Date: Wed Mar 2 09:05:10 2011
New Revision: 855
Log:
[AMDATU-258] Added war profile to release module supporting WAR deployment. The
WAR builds and runs, but errors still need to be resolved.
Added:
branches/0.2/amdatu-release/src/main/assembly/war-component.xml
branches/0.2/amdatu-release/src/main/assembly/war-release.xml
branches/0.2/amdatu-release/src/main/java/
branches/0.2/amdatu-release/src/main/java/org/
branches/0.2/amdatu-release/src/main/java/org/amdatu/
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/FrameworkService.java
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/ProvisionActivator.java
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/StartupListener.java
branches/0.2/amdatu-release/src/main/webapp/
branches/0.2/amdatu-release/src/main/webapp/framework.properties
branches/0.2/amdatu-release/src/main/webapp/web.xml
Modified:
branches/0.2/amdatu-release/pom.xml
branches/0.2/amdatu-release/src/main/assembly/bin-component.xml
Modified: branches/0.2/amdatu-release/pom.xml
==============================================================================
--- branches/0.2/amdatu-release/pom.xml (original)
+++ branches/0.2/amdatu-release/pom.xml Wed Mar 2 09:05:10 2011
@@ -387,6 +387,16 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.proxy</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${org.apache.felix.main.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-core</artifactId>
<version>${pax.swissbox.version}</version>
@@ -529,5 +539,90 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Profile active only for release builds -->
+ <id>build-war</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Handy plugin to test the webapp. Just run the command 'mvn
jetty:run', open a browser
+ and navigate to localhost:8080/amdatu -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
+ <configuration>
+
<webApp>target/org.amdatu.amdatu-release-0.2.0-SNAPSHOT-war.war</webApp>
+ <contextPath>/</contextPath>
+ <systemProperties>
+ <systemProperty>
+ <name>amdatu.work.dir</name>
+ <value>c:/temp/amdatu-work</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>true</debug>
+ <optimize>false</optimize>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>true</debug>
+ <optimize>false</optimize>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <debug>true</debug>
+ <optimize>false</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/war-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: branches/0.2/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- branches/0.2/amdatu-release/src/main/assembly/bin-component.xml
(original)
+++ branches/0.2/amdatu-release/src/main/assembly/bin-component.xml Wed Mar
2 09:05:10 2011
@@ -71,6 +71,10 @@
<include>org.ops4j.pax.swissbox:*</include>
<include>org.ops4j.base:*</include>
</includes>
+ <excludes>
+ <exclude>org.apache.felix:org.apache.felix.framework</exclude>
+ <exclude>org.apache.felix:org.apache.felix.http.proxy</exclude>
+ </excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
Added: branches/0.2/amdatu-release/src/main/assembly/war-component.xml
==============================================================================
--- (empty file)
+++ branches/0.2/amdatu-release/src/main/assembly/war-component.xml Wed Mar
2 09:05:10 2011
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0
view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";>
+
+ <!--
+ Shared component definition for
+ - bin-release
+ - dev-server
+ -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>amdatu/amdatu-application</outputDirectory>
+
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.amdatu.authentication:*</include>
+ <include>org.amdatu.authentication.*:*</include>
+ <include>org.amdatu.authorization:*</include>
+ <include>org.amdatu.authorization.*:*</include>
+ <include>org.amdatu.cassandra:*</include>
+ <include>org.amdatu.cassandra.*:*</include>
+ <include>org.amdatu.opensocial:*</include>
+ <include>org.amdatu.opensocial.*:*</include>
+ <include>org.amdatu.semanticweb:*</include>
+ <include>org.amdatu.semanticweb.*:*</include>
+ <include>org.amdatu.web:*</include>
+ <include>org.amdatu.web.*:*</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>amdatu/amdatu-examples</outputDirectory>
+
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.amdatu.example:*</include>
+ <include>org.amdatu.example.*:*</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>amdatu/amdatu-core</outputDirectory>
+
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.amdatu.core:*</include>
+ <include>org.amdatu.core.*:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.amdatu.core.config:filebased</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>amdatu/amdatu-system</outputDirectory>
+ <includes>
+ <include>org.apache.felix:*</include>
+ <include>org.apache.sling:*</include>
+ <include>org.ops4j.pax.web:*</include>
+ <include>org.ops4j.pax.useradmin:*</include>
+ <include>org.ops4j.pax.swissbox:*</include>
+ <include>org.ops4j.base:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.felix:org.apache.felix.framework</exclude>
+ <exclude>org.apache.felix:org.apache.felix.main</exclude>
+ <exclude>org.apache.felix:org.apache.felix.http.proxy</exclude>
+ <exclude>org.osgi:*</exclude>
+ </excludes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.osgi:*</include>
+ <include>org.apache.felix:org.apache.felix.framework</include>
+ <include>org.apache.felix:org.apache.felix.http.proxy</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/webapp</directory>
+ <outputDirectory>WEB-INF</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
+ <filtered>false</filtered>
+ </fileSet>
+ <fileSet>
+
<directory>../amdatu-core/config-filebased/src/main/resources/conf</directory>
+ <outputDirectory>amdatu/deploy</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+
+</component>
\ No newline at end of file
Added: branches/0.2/amdatu-release/src/main/assembly/war-release.xml
==============================================================================
--- (empty file)
+++ branches/0.2/amdatu-release/src/main/assembly/war-release.xml Wed Mar
2 09:05:10 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+ <id>war</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module
prefixes -->
+
+ <componentDescriptors>
+
<componentDescriptor>src/main/assembly/war-component.xml</componentDescriptor>
+ </componentDescriptors>
+
+</assembly>
\ No newline at end of file
Added:
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/FrameworkService.java
==============================================================================
--- (empty file)
+++
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/FrameworkService.java
Wed Mar 2 09:05:10 2011
@@ -0,0 +1,143 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.amdatu.webapp;
+
+import java.io.File;
+import java.io.FilePermission;
+import java.io.IOException;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+
+import org.apache.felix.framework.Felix;
+import org.apache.felix.framework.util.FelixConstants;
+
+public final class FrameworkService
+{
+ private final ServletContext m_servletContext;
+ private Felix m_felix;
+
+ public FrameworkService(ServletContext context) {
+ m_servletContext = context;
+ }
+
+ public void start() {
+ try {
+ doStart();
+ } catch (Exception e) {
+ log("Failed to start framework", e);
+ }
+ }
+
+ public void stop() {
+ try {
+ doStop();
+ } catch (Exception e) {
+ log("Error stopping framework", e);
+ }
+ }
+
+ private void doStart() throws Exception {
+ System.out.println("Starting Felix");
+ Felix tmp = new Felix(createConfig());
+ tmp.start();
+ m_felix = tmp;
+ log("OSGi framework started", null);
+ }
+
+ private void doStop() throws Exception {
+ if (m_felix != null) {
+ m_felix.stop();
+ }
+
+ log("OSGi framework stopped", null);
+ }
+
+ private Map<String, Object> createConfig() throws Exception {
+ String amdatuWorkDir = System.getProperty("amdatu.work.dir");
+ if (amdatuWorkDir == null || amdatuWorkDir.isEmpty()) {
+ System.out.println("No amdatu.work.dir system property defined
which is required");
+ throw new IllegalArgumentException("No amdatu.work.dir system
property defined which is requied");
+ }
+ System.setProperty("user.dir", amdatuWorkDir);
+ System.out.println("***** Current directory set to " + amdatuWorkDir);
+
+ Properties props = new Properties();
+
props.load(m_servletContext.getResourceAsStream("/WEB-INF/framework.properties"));
+ HashMap<String, Object> map = new HashMap<String, Object>();
+ for (Object key : props.keySet()) {
+ map.put(key.toString(), props.get(key));
+ }
+
+ // Check that we can create and remove a temp dir/temp file
+ System.out.println("R/W access to " + amdatuWorkDir + ": " + new
File(amdatuWorkDir).canRead() + "/" + new File(amdatuWorkDir).canWrite());
+
+ System.out.println("security manager:
"+System.getProperty("java.security.manager"));
+ System.out.println("security manager: "+System.getSecurityManager());
+ System.out.println("security policy: "+System.getProperty("policy"));
+ //checkDir("work");
+ //checkDir("work/test");
+ //checkDir("work/test/a");
+ AccessControlContext acc = AccessController.getContext();
+ System.out.println("AccessControlContext="+acc);
+ System.out.println(acc.getDomainCombiner());
+ acc.checkPermission(new FilePermission(amdatuWorkDir, "write"));
+
+ map.put("felix.cache.rootdir", amdatuWorkDir); // No constant for this
one
+ // map.put("felix.cm.dir", amdatuWorkDir + File.separator +
"configadmin");
+ //map.put("felix.fileinstall.tmpdir", amdatuWorkDir + File.separator +
"fileinstall");
+ // map.put(FelixConstants.FRAMEWORK_STORAGE, amdatuWorkDir +
File.separator + "cache");
+ String deployDir = m_servletContext.getRealPath("/amdatu/deploy/");
+ map.put("felix.fileinstall.dir", deployDir);
+ System.out.println("Deploy directory = " + deployDir);
+
+ map.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, Arrays.asList(new
ProvisionActivator(m_servletContext)));
+ return map;
+ }
+
+ private void log(String message, Throwable cause) {
+ m_servletContext.log(message, cause);
+ }
+
+ private void checkDir(String tempDir) throws IOException {
+ String temp = "temp.tmp";
+ File tempDirFile = new File(tempDir);
+ if (!tempDirFile.mkdirs()) {
+ System.out.println("ERROR: Could not create temp dir '" +
tempDirFile.getAbsolutePath() + "'");
+ } else if (!new File(tempDir).exists()) {
+ System.out.println("ERROR: Could create temp dir '" + tempDir +
"', but dir still does not exist");
+ } else {
+ File tempFile = new File(tempDir + "/" + temp);
+ if (!tempFile.createNewFile() || !new File(tempDir + "/" +
temp).exists()) {
+ System.out.println("ERROR: Could not create temp file '" +
tempDir + "/" + temp + "'");
+ } else {
+ System.out.println("INFO: Could create temp dir and file '" +
tempDir + "/" + temp + "'");
+ /* if (!tempFile.delete()) {
+ System.out.println("ERROR: Could not delete temp file");
+ }
+ if (!tempDirFile.delete()) {
+ System.out.println("ERROR: Could not delete temp dir");
+ }*/
+ }
+ }
+ }
+}
Added:
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/ProvisionActivator.java
==============================================================================
--- (empty file)
+++
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/ProvisionActivator.java
Wed Mar 2 09:05:10 2011
@@ -0,0 +1,77 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.amdatu.webapp;
+
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public final class ProvisionActivator implements BundleActivator {
+ private final ServletContext m_servletContext;
+
+ public ProvisionActivator(ServletContext servletContext) {
+ m_servletContext = servletContext;
+ }
+
+ public void start(BundleContext context) throws Exception {
+ System.out.println("Provisioning OSGi bundles");
+ m_servletContext.setAttribute(BundleContext.class.getName(), context);
+ /*ArrayList<Bundle> installed = new ArrayList<Bundle>();
+ for (URL url : findBundles()) {
+ this.m_servletContext.log("Installing bundle [" + url + "]");
+ System.out.println("Installing bundle [" + url + "]");
+ Bundle bundle = context.installBundle(url.toExternalForm());
+ installed.add(bundle);
+ }
+
+ for (Bundle bundle : installed) {
+ bundle.start();
+ }*/
+ }
+
+ public void stop(BundleContext context) throws Exception{
+ }
+
+ private List<URL> findBundles() throws Exception {
+ ArrayList<URL> allBundles = new ArrayList<URL>();
+ allBundles.addAll(loadDir("amdatu-system"));
+ allBundles.addAll(loadDir("amdatu-core"));
+ allBundles.addAll(loadDir("amdatu-application"));
+ allBundles.addAll(loadDir("amdatu-examples"));
+ return allBundles;
+ }
+
+ private List<URL> loadDir(String dirname) throws Exception{
+ ArrayList<URL> list = new ArrayList<URL>();
+ for (Object o : this.m_servletContext.getResourcePaths("/amdatu/" +
dirname + "/")) {
+ String name = (String) o;
+ if (name.endsWith(".jar")) {
+ URL url = this.m_servletContext.getResource(name);
+ if (url != null) {
+ list.add(url);
+ }
+ }
+ }
+ return list;
+ }
+}
Added:
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/StartupListener.java
==============================================================================
--- (empty file)
+++
branches/0.2/amdatu-release/src/main/java/org/amdatu/webapp/StartupListener.java
Wed Mar 2 09:05:10 2011
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2010 Amdatu.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.amdatu.webapp;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public final class StartupListener implements ServletContextListener {
+ private FrameworkService m_frameworkService;
+
+ public void contextInitialized(ServletContextEvent event) {
+ System.out.println("Starting felix!!!");
+ m_frameworkService = new FrameworkService(event.getServletContext());
+ m_frameworkService.start();
+ }
+
+ public void contextDestroyed(ServletContextEvent event) {
+ m_frameworkService.stop();
+ }
+}
Added: branches/0.2/amdatu-release/src/main/webapp/framework.properties
==============================================================================
--- (empty file)
+++ branches/0.2/amdatu-release/src/main/webapp/framework.properties Wed Mar
2 09:05:10 2011
@@ -0,0 +1,187 @@
+
+org.osgi.framework.system.packages.extra=sun.misc,com.sun.management
+
+org.osgi.framework.storage=felix-deploy
+
+felix.cache.rootdir=work/cache
+
+felix.cm.dir=work/configadmin
+
+# Config of file install
+felix.fileinstall.poll=3000
+felix.fileinstall.dir=deploy
+felix.fileinstall.debug=1
+felix.fileinstall.bundles.new.start=true
+felix.fileinstall.filter=.*
+felix.fileinstall.tmpdir=work/fileinstall
+felix.fileinstall.disableConfigSave=true
+
+org.osgi.framework.storage.clean = onFirstInit
+
+org.osgi.framework.system.packages = \
+ org.osgi.framework; version=1.5.0, \
+ org.osgi.framework.hooks.service, \
+ org.osgi.framework.launch, \
+ org.osgi.service.condpermadmin; version=1.0.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.permissionadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
+ org.osgi.service.url; version=1.0.0,\
+ org.osgi.service.application;version="1.0", \
+ org.osgi.service.cm;version="1.2", \
+ org.osgi.service.component;version="1.0", \
+ org.osgi.service.deploymentadmin;version="1.0", \
+
org.osgi.service.deploymentadmin.spi;uses:="org.osgi.service.deploymentadmin";version="1.0",
\
+ org.osgi.service.device;version="1.1", \
+ org.osgi.service.event;version="1.1", \
+ org.osgi.service.http;version="1.2", \
+ org.osgi.service.io;version="1.0", \
+ org.osgi.service.log;version="1.3", \
+ org.osgi.service.metatype;version="1.1", \
+ org.osgi.service.monitor;version="1.0", \
+ org.osgi.service.prefs;version="1.1", \
+ org.osgi.service.provisioning;version="1.1", \
+ org.osgi.service.upnp;version="1.1", \
+ org.osgi.service.useradmin;version="1.1", \
+ org.osgi.service.wireadmin;version="1.0", \
+ info.dmtree.notification;version="1.0", \
+ info.dmtree.notification.spi;uses:="info.dmtree.notification";version="1.0", \
+ info.dmtree.registry;uses:="info.dmtree.notification";version="1.0", \
+ info.dmtree.security;version="1.0", \
+ info.dmtree.spi;version="1.0", \
+ org.osgi.util.gsm;version="1.0", \
+ org.osgi.util.measurement;version="1.0", \
+ org.osgi.util.mobile;version="1.0", \
+ org.osgi.util.position;uses:="org.osgi.util.measurement";version="1.0", \
+ org.osgi.util.tracker;version="1.4", \
+ org.osgi.util.xml;version="1.0",\
+ javax.accessibility,\
+ javax.activity,\
+ javax.activation,\
+ javax.annotation,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.transaction,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.bind,\
+ javax.xml.bind.annotation,\
+ javax.xml.bind.annotation.adapters,\
+ javax.xml.bind.attachment,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.stream,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ org.ietf.jgss,\
+ org.omg.CORBA,\
+ org.omg.CORBA_2_3,\
+ org.omg.CORBA_2_3.portable,\
+ org.omg.CORBA.DynAnyPackage,\
+ org.omg.CORBA.ORBPackage,\
+ org.omg.CORBA.portable,\
+ org.omg.CORBA.TypeCodePackage,\
+ org.omg.CosNaming,\
+ org.omg.CosNaming.NamingContextExtPackage,\
+ org.omg.CosNaming.NamingContextPackage,\
+ org.omg.Dynamic,\
+ org.omg.DynamicAny,\
+ org.omg.DynamicAny.DynAnyFactoryPackage,\
+ org.omg.DynamicAny.DynAnyPackage,\
+ org.omg.IOP,\
+ org.omg.IOP.CodecFactoryPackage,\
+ org.omg.IOP.CodecPackage,\
+ org.omg.Messaging,\
+ org.omg.PortableInterceptor,\
+ org.omg.PortableInterceptor.ORBInitInfoPackage,\
+ org.omg.PortableServer,\
+ org.omg.PortableServer.CurrentPackage,\
+ org.omg.PortableServer.POAManagerPackage,\
+ org.omg.PortableServer.POAPackage,\
+ org.omg.PortableServer.portable,\
+ org.omg.PortableServer.ServantLocatorPackage,\
+ org.omg.SendingContext,\
+ org.omg.stub.java.rmi,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers,\
+ javax.servlet;javax.servlet.http;version=2.5
Added: branches/0.2/amdatu-release/src/main/webapp/web.xml
==============================================================================
--- (empty file)
+++ branches/0.2/amdatu-release/src/main/webapp/web.xml Wed Mar 2 09:05:10 2011
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app>
+
+ <listener>
+ <listener-class>org.amdatu.webapp.StartupListener</listener-class>
+ </listener>
+
+ <listener>
+
<listener-class>org.apache.felix.http.proxy.ProxyListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>proxy</servlet-name>
+ <servlet-class>org.apache.felix.http.proxy.ProxyServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>proxy</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
