Author: [email protected]
Date: Tue May 1 09:56:29 2012
New Revision: 2291
Log:
[AMDATUOPENSOCIAL-209] Updated release-demo artifact for 0.4.0 upgrade
Added:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/util/
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/util/ConversionUtil.java
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-core-config.xml
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-web-config.xml
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.web.rest.wink.xml
trunk/amdatu-opensocial/release-demo/src/main/resources/config/tenant-tenant1.xml
Modified:
trunk/amdatu-opensocial/config/pom.xml
trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml
trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
trunk/amdatu-opensocial/opensocial-gadgets/login-gadget/pom.xml
trunk/amdatu-opensocial/opensocial-shindig/pom.xml
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/AppDataServiceImpl.java
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/release-demo/pom.xml
trunk/amdatu-opensocial/release-demo/src/main/assembly/bin-component.xml
trunk/amdatu-opensocial/release-demo/src/main/resources/conf/amdatu-platform.properties
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.core.config.templates.cfg
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.core.loghandler.cfg
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.core.tenant.cfg
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.apache.felix.http.cfg
Modified: trunk/amdatu-opensocial/config/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/config/pom.xml (original)
+++ trunk/amdatu-opensocial/config/pom.xml Tue May 1 09:56:29 2012
@@ -73,7 +73,7 @@
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
- <include>*.cfg</include>
+ <include>*.xml</include>
</includes>
</resource>
</resources>
Modified: trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetcontainer/pom.xml Tue May 1
09:56:29 2012
@@ -60,6 +60,7 @@
<instructions>
<Bundle-SymbolicName>
org.amdatu.opensocial.gadgetcontainer</Bundle-SymbolicName>
<Export-Package>org.amdatu.opensocial.gadgetcontainer</Export-Package>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-gadgetmanagement/pom.xml Tue May 1
09:56:29 2012
@@ -153,11 +153,13 @@
<artifactId>org.amdatu.auth.tools.rest.doclet</artifactId>
<version>${amdatu.auth.version}</version>
</docletArtifact>
+ <!-- FIXME: disable for now
<docletArtifact>
<groupId>com.cenqua.clover</groupId>
<artifactId>clover</artifactId>
<version>3.1.3</version>
</docletArtifact>
+ -->
</docletArtifacts>
<debug>true</debug>
<subpackages>org.amdatu.opensocial.gadgetmanagement.rest</subpackages>
Modified: trunk/amdatu-opensocial/opensocial-gadgets/login-gadget/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-gadgets/login-gadget/pom.xml
(original)
+++ trunk/amdatu-opensocial/opensocial-gadgets/login-gadget/pom.xml Tue May
1 09:56:29 2012
@@ -28,15 +28,16 @@
<description>Provides a login gadget</description>
<properties>
- <amdatu.auth.version>0.2.2-RC1</amdatu.auth.version>
+ <amdatu.auth.version>0.3.0-SNAPSHOT</amdatu.auth.version>
</properties>
<dependencies>
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
- <type>bundle</type>
<version>${amdatu.auth.version}</version>
+ <type>bundle</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
Modified: trunk/amdatu-opensocial/opensocial-shindig/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/opensocial-shindig/pom.xml (original)
+++ trunk/amdatu-opensocial/opensocial-shindig/pom.xml Tue May 1 09:56:29 2012
@@ -41,6 +41,7 @@
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetcontainer</artifactId>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -199,6 +200,12 @@
<version>2.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.8.3</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/module/ConfigurationAdminGuiceModule.java
Tue May 1 09:56:29 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed 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
@@ -15,20 +15,13 @@
*/
package org.amdatu.opensocial.shindig.module;
-import static
org.amdatu.opensocial.shindig.config.ShindigConfigurationService.WORKDIR;
-
import org.amdatu.opensocial.shindig.config.ShindigConfigurationService;
-import org.amdatu.template.processor.TemplateContext;
import org.amdatu.template.processor.TemplateException;
-import org.amdatu.template.processor.TemplateProcessor;
-import org.amdatu.template.processor.velocity.VelocityTemplateEngine;
-import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Properties;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
@@ -45,7 +38,7 @@
private volatile BundleContext m_bundleContext;
private volatile LogService m_logService;
- private volatile VelocityTemplateEngine m_templateEngine;
+ // FIXME private volatile VelocityTemplateEngine m_templateEngine;
private Properties m_properties;
@@ -67,10 +60,7 @@
m_logService.log(LogService.LOG_ERROR, "Could not write
container.js to shindig work directory", e);
return;
}
- catch (TemplateException e) {
- m_logService.log(LogService.LOG_ERROR, "Could not write
container.js to shindig work directory", e);
- return;
- }
+
// We make a copy of the properties, since we don't know what
bindProperties does with them.
Names.bindProperties(binder(), m_properties);
@@ -79,13 +69,14 @@
/**
* We must copy the container.js from our bundle to a file on disk and
replace some configuration entries
* with values from config admin. This is necessary in particular for the
context path properties.
- *
+ *
* @throws IOException
* @throws URISyntaxException
* @throws TemplateException
*/
- private void copyContainerJs() throws IOException, URISyntaxException,
TemplateException {
+ private void copyContainerJs() throws IOException, URISyntaxException {
// FIXME: this needs to be checked
+ /**
// Source file
Bundle bundle = m_bundleContext.getBundle();
File sourceFile = new File(bundle.getResource(CONTAINER_JS).toURI());
@@ -103,5 +94,6 @@
// Process the input file and write the result to an output file
processor.generateFile(context, targetFile);
+ **/
}
}
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Tue May 1 09:56:29 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed 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
@@ -35,7 +35,7 @@
import org.amdatu.opensocial.shindig.service.ShindigDispatchExtenderFilter;
import org.amdatu.opensocial.shindig.service.ShindigOpenSocialContainerImpl;
import org.amdatu.opensocial.shindig.service.ShindigRegistrationServiceImpl;
-import org.amdatu.template.processor.velocity.VelocityTemplateEngine;
+// FIXME: import org.amdatu.template.processor.velocity.VelocityTemplateEngine;
import org.amdatu.tenant.Tenant;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.httpcontext.ResourceProvider;
@@ -53,7 +53,7 @@
/**
* This is the OSGi activator for this Shindig application bundle.
- *
+ *
* @author ivol
*/
public class Activator extends DependencyActivatorBase {
@@ -132,7 +132,7 @@
createComponent()
.setInterface(ConfigurationAdminGuiceModule.class.getName(),
null)
.setImplementation(ConfigurationAdminGuiceModule.class)
-
.add(createServiceDependency().setService(VelocityTemplateEngine.class).setRequired(true))
+ // FIXME
.add(createServiceDependency().setService(VelocityTemplateEngine.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(ShindigConfigurationService.class).setRequired(true)));
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/AppDataServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/AppDataServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/persistence/AppDataServiceImpl.java
Tue May 1 09:56:29 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed 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
@@ -17,8 +17,8 @@
import static
org.amdatu.opensocial.gadgetcontainer.OpenSocialContainer.APP_DATA;
-import org.amdatu.opensocial.gadgetmanagement.service.ConversionUtil;
import org.amdatu.opensocial.shindig.service.ShindigDispatchExtenderFilter;
+import org.amdatu.opensocial.shindig.util.ConversionUtil;
import java.io.IOException;
import java.util.HashMap;
@@ -48,7 +48,7 @@
* but it resolves users against a tenant aware UserAdmin. To resolve the
proper tenant currently a Tenant dispatch
* extender filter is used to puts the current tenant on a ThreadLocal
variable. This is a temporary solution, until
* a better solution is available.
- *
+ *
* @author ivol
*/
public class AppDataServiceImpl implements AppDataService {
Added:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/util/ConversionUtil.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/util/ConversionUtil.java
Tue May 1 09:56:29 2012
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2010, 2011 The Amdatu Foundation
+ *
+ * Licensed 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.amdatu.opensocial.shindig.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public final class ConversionUtil {
+ // Default amount of bytes to read at once
+ private static final int DEFAULT_BYTE_SIZE = 1024;
+
+ private ConversionUtil() {
+ }
+
+ /**
+ * Converts a serializable Java object to a byte array.
+ *
+ * @param object The object to convert
+ * @return The converted array of bytes
+ * @throws IOException In case the object could not be converted (likely
since it is
+ * not serializable)
+ */
+ public static byte[] objectToByteArray(final Object object) throws
IOException {
+ ByteArrayOutputStream bos = null;
+ ObjectOutputStream oos = null;
+ try {
+ bos = new ByteArrayOutputStream();
+ oos = new ObjectOutputStream(bos);
+ oos.writeObject(object);
+ oos.flush();
+ }
+ finally {
+ try {
+ if (oos != null) {
+ oos.close();
+ }
+ }
+ finally {
+ if (bos != null) {
+ bos.close();
+ }
+ }
+ }
+ return bos.toByteArray();
+ }
+
+ /**
+ * Converts a byte array to a Java object assuming the byte array
represents a
+ * serialized serializable Java object.
+ *
+ * @param bytes Array of bytes to convert
+ * @return The converted object
+ * @throws ClassNotFoundException Instead the class of the serialized Java
object
+ * could not be found (likely caused by the fact that the class is
not available in
+ * this bundles classloader)
+ * @throws IOException In case any IO exception occurred
+ */
+ public static Object byteArrayToObject(final byte[] bytes) throws
ClassNotFoundException, IOException {
+ ByteArrayInputStream bis = null;
+ ObjectInputStream ois = null;
+ Object data = null;
+ try {
+ bis = new ByteArrayInputStream(bytes);
+ ois = new ObjectInputStream(bis);
+ data = ois.readObject();
+ }
+ finally {
+ try {
+ if (ois != null) {
+ ois.close();
+ }
+ }
+ finally {
+ if (bis != null) {
+ bis.close();
+ }
+ }
+ }
+ return data;
+ }
+
+ public static File urlToFile(final URL url) throws IOException,
URISyntaxException {
+ String filename = url.toURI().getRawPath();
+ filename = filename.substring(filename.lastIndexOf("/") + 1);
+ File tempFile = File.createTempFile(filename, ".temp");
+ InputStream is = null;
+ FileOutputStream fos = null;
+ try {
+ is = url.openStream();
+ fos = new FileOutputStream(tempFile);
+ int len = 0;
+ byte[] b = new byte[DEFAULT_BYTE_SIZE];
+ while ((len = is.read(b)) > 0) {
+ fos.write(b, 0, len);
+ }
+ }
+ finally {
+ if (is != null) {
+ try {
+ is.close();
+ }
+ finally {
+ if (fos != null) {
+ fos.close();
+ }
+ }
+ }
+ }
+ return tempFile;
+ }
+}
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Tue May 1 09:56:29 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
- <version>6-RC2</version>
+ <version>4</version>
<relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
<groupId>org.amdatu.opensocial</groupId>
@@ -333,6 +333,8 @@
</execution>
</executions>
</plugin>
+
+ <!-- FIXME: disable for now
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
@@ -340,12 +342,13 @@
<configuration>
<includesTestSourceRoots>false</includesTestSourceRoots>
<excludes>
- <!-- Exclude test files from code coverage report -->
+ Exclude test files from code coverage report
<exclude>**/org/amdatu/test/**/*.java</exclude>
<exclude>**/org/amdatu/opensocial/test/integration/**/*.java</exclude>
</excludes>
</configuration>
</plugin>
+ -->
</plugins>
<pluginManagement>
<plugins>
@@ -487,36 +490,4 @@
</plugin>
</plugins>
</reporting>
-
- <!-- FIXME: for now disable fail on error -->
- <profiles>
- <profile>
- <id>checkstyle</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configLocation>amdatu_checks.xml</configLocation>
- <enableRulesSummary>false</enableRulesSummary>
- <failsOnError>false</failsOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/amdatu-opensocial/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/release-demo/pom.xml (original)
+++ trunk/amdatu-opensocial/release-demo/pom.xml Tue May 1 09:56:29 2012
@@ -31,144 +31,41 @@
<amdatu.http.port>8080</amdatu.http.port>
<amdatu.https.port>8045</amdatu.https.port>
<amdatu.log.level>INFO</amdatu.log.level>
+ <amdatu.tenant.id>tenant1</amdatu.tenant.id>
+ <amdatu.tenant.name>Tenant 1</amdatu.tenant.name>
- <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
- <org.amdatu.lib.version>0.2.1</org.amdatu.lib.version>
- <org.amdatu.auth.version>0.2.2-RC1</org.amdatu.auth.version>
- <org.amdatu.cassandra.version>0.2.2</org.amdatu.cassandra.version>
+ <org.amdatu.auth.version>0.3.0-SNAPSHOT</org.amdatu.auth.version>
+
+ <org.amdatu.tenant.version>0.4.0-RC2</org.amdatu.tenant.version>
+
<org.amdatu.fileinstall.version>${org.amdatu.tenant.version}</org.amdatu.fileinstall.version>
+
<org.amdatu.deployment.version>${org.amdatu.tenant.version}</org.amdatu.deployment.version>
+
<org.amdatu.eventadmin.version>${org.amdatu.tenant.version}</org.amdatu.eventadmin.version>
+
<org.amdatu.configadmin.version>${org.amdatu.tenant.version}</org.amdatu.configadmin.version>
+
<org.amdatu.preferences.version>${org.amdatu.tenant.version}</org.amdatu.preferences.version>
+
<org.amdatu.useradmin.version>${org.amdatu.tenant.version}</org.amdatu.useradmin.version>
+
<org.amdatu.httpservice.version>${org.amdatu.tenant.version}</org.amdatu.httpservice.version>
+
<org.amdatu.template.version>${org.amdatu.tenant.version}</org.amdatu.template.version>
+
<org.amdatu.useradmin.version>${org.amdatu.tenant.version}</org.amdatu.useradmin.version>
+
<org.amdatu.web.version>${org.amdatu.tenant.version}</org.amdatu.web.version>
<org.apache.felix.main.version>4.0.2</org.apache.felix.main.version>
-
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
-
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
<org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
- <org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
-
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
-
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
+
<org.apache.felix.metatype.version>1.0.5-r1244118</org.apache.felix.metatype.version>
+
<org.apache.felix.http.jetty.version>2.0.4</org.apache.felix.http.jetty.version>
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
- <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
- <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
-
- <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
-
- <!-- Cassandra properties -->
- <cassandra.autobootstrap>false</cassandra.autobootstrap>
- <cassandra.clustername>'Amdatu Cassandra Cluster'</cassandra.clustername>
- <cassandra.consistency_level_read>ONE</cassandra.consistency_level_read>
- <cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
-
<cassandra.default_replication_factor>1</cassandra.default_replication_factor>
- <cassandra.initial_token>0</cassandra.initial_token>
- <cassandra.listen_address>127.0.0.1</cassandra.listen_address>
- <cassandra.rpc_address>127.0.0.1</cassandra.rpc_address>
- <cassandra.rpc_port>9160</cassandra.rpc_port>
- <cassandra.seeds>127.0.0.1</cassandra.seeds>
- <cassandra.storage_port>7000</cassandra.storage_port>
+ <org.apache.felix.shell.version>1.4.3</org.apache.felix.shell.version>
+
<org.apache.ace.managementagent.version>0.8.1-r1308923</org.apache.ace.managementagent.version>
+
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
+
<org.apache.felix.configadmin.version>1.2.8-amdatu1</org.apache.felix.configadmin.version>
+
<org.apache.felix.prefs.version>1.0.5-r1299689</org.apache.felix.prefs.version>
+
<org.apache.felix.deployment.rp.autoconf.version>0.1.1-r1244118</org.apache.felix.deployment.rp.autoconf.version>
+ <pax.useradmin.version>0.0.1-amdatu3</pax.useradmin.version>
</properties>
- <repositories>
- <repository>
- <id>amdatu.releases</id>
- <name>Amdatu Release Repository</name>
- <url>http://repository.amdatu.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>amdatu.snapshots</id>
- <name>Amdatu Snapshot Repository</name>
- <url>http://repository.amdatu.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
- <dependency>
- <groupId>org.amdatu.template</groupId>
- <artifactId>org.amdatu.template.processor</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.tenant</groupId>
- <artifactId>org.amdatu.tenant.api</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.httpcontext</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.dispatcher</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.resource</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jsp</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jaxrs</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.wink</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
-
+ <!-- Platform dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
@@ -176,15 +73,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>${org.apache.felix.eventadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -207,26 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.prefs</artifactId>
- <version>${org.apache.felix.prefs.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -243,8 +114,8 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${org.apache.felix.webconsole.version}</version>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${org.apache.felix.http.jetty.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -260,73 +131,147 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <version>${pax.useradmin.version}</version>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>org.apache.ace.managementagent</artifactId>
+ <version>${org.apache.ace.managementagent.version}</version>
<scope>compile</scope>
</dependency>
-
- <!-- Add all the Cassandra dependencies -->
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.api</artifactId>
+ <version>${org.amdatu.tenant.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.adapter</artifactId>
+ <version>${org.amdatu.tenant.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.tenant</groupId>
+ <artifactId>org.amdatu.tenant.factory</artifactId>
+ <version>${org.amdatu.tenant.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.fileinstall</groupId>
+ <artifactId>org.amdatu.fileinstall.autoconf</artifactId>
+ <version>${org.amdatu.fileinstall.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.gadget</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.deployment</groupId>
+ <artifactId>org.amdatu.deployment.autoconf</artifactId>
+ <version>${org.amdatu.deployment.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.listener</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.eventadmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.apache.felix.eventadmin</artifactId>
+ <version>${org.amdatu.eventadmin.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.configadmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.apache.felix.configadmin</artifactId>
+ <version>${org.amdatu.configadmin.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.preferences</groupId>
+ <artifactId>org.amdatu.multitenant.org.apache.felix.prefs</artifactId>
+ <version>${org.amdatu.preferences.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.consumer</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
+ <groupId>org.amdatu.useradmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</artifactId>
+ <version>${org.amdatu.useradmin.version}</version>
+ <scope>runtime</scope>
<type>bundle</type>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.token</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.useradmin</groupId>
+
<artifactId>org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</artifactId>
+ <version>${org.amdatu.useradmin.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
</dependency>
+
+ <!-- Web dependencies -->
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.nonce</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.httpservice</groupId>
+
<artifactId>org.amdatu.multitenant.org.apache.felix.http.jetty</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.store.useradmin</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.httpcontext</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.config</artifactId>
- <version>${org.amdatu.cassandra.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jaxrs</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.dispatcher</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.wink</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.jsp</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web</groupId>
+ <artifactId>org.amdatu.web.resource</artifactId>
+ <version>${org.amdatu.web.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.template</groupId>
+ <artifactId>org.amdatu.template.processor</artifactId>
+ <version>${org.amdatu.template.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
</dependency>
<!-- Add the Auth dependencies -->
@@ -388,6 +333,12 @@
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.gadgetcontainer</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
<type>bundle</type>
<scope>compile</scope>
Modified:
trunk/amdatu-opensocial/release-demo/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-opensocial/release-demo/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-opensocial/release-demo/src/main/assembly/bin-component.xml
Tue May 1 09:56:29 2012
@@ -3,32 +3,71 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
<dependencySets>
<dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.osgi:org.osgi.compendium</include>
- <include>org.apache.felix:*</include>
- <include>org.ops4j.pax.useradmin:*</include>
+ <include>org.apache.felix:org.apache.felix.main</include>
+ <include>org.apache.felix:org.apache.felix.fileinstall</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>multitenantweb</outputDirectory>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.dependencymanager</include>
+
<include>org.apache.felix:org.apache.felix.dependencymanager.shell</include>
+ <include>org.apache.felix:org.apache.felix.metatype</include>
+ <include>org.apache.felix:org.apache.felix.log</include>
+ <include>org.apache.felix:org.apache.felix.shell</include>
+ <include>org.apache.felix:org.apache.felix.shell.tui</include>
+ <include>org.apache.ace:org.apache.ace.managementagent</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.api</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.adapter</include>
+ <include>org.amdatu.tenant:org.amdatu.tenant.factory</include>
+
<include>org.amdatu.fileinstall:org.amdatu.fileinstall.autoconf</include>
+ <include>org.amdatu.deployment:org.amdatu.deployment.autoconf</include>
+
<include>org.amdatu.configadmin:org.amdatu.multitenant.org.apache.felix.configadmin</include>
+
<include>org.amdatu.eventadmin:org.amdatu.multitenant.org.apache.felix.eventadmin</include>
+
<include>org.amdatu.preferences:org.amdatu.multitenant.org.apache.felix.prefs</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.ops4j.pax.useradmin.pax-useradmin-service</include>
+
<include>org.amdatu.useradmin:org.amdatu.multitenant.org.amdatu.useradmin.pax.fsstorage</include>
+ <include>org.amdatu.web:org.amdatu.web.dispatcher</include>
+ <include>org.amdatu.web:org.amdatu.web.httpcontext</include>
+
<include>org.amdatu.httpservice:org.amdatu.multitenant.org.apache.felix.http.jetty</include>
+ <include>org.amdatu.web:org.amdatu.web.jaxrs</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.hostname</include>
+
<include>org.amdatu.web:org.amdatu.web.tenantresolver.parameter</include>
+ <include>org.amdatu.web:org.amdatu.web.wink</include>
+ <include>org.amdatu.web:org.amdatu.web.jsp</include>
+ <include>org.amdatu.web:org.amdatu.web.resource</include>
+ <include>org.amdatu.template:org.amdatu.template.processor</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
</dependencySet>
<dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>deploy</outputDirectory>
<includes>
- <include>org.amdatu.core:*</include>
- <include>org.amdatu.web:*</include>
- <include>org.amdatu.cassandra:*</include>
<include>org.amdatu.auth:*</include>
<include>org.amdatu.opensocial:*</include>
</includes>
<excludes>
- <exclude>org.amdatu.cassandra:org.amdatu.cassandra.config</exclude>
<exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
<exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
</excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
</dependencySet>
<!--Unpack the the config files to deploy directory -->
@@ -36,7 +75,6 @@
<outputDirectory>deploy</outputDirectory>
<includes>
<include>org.amdatu.auth:org.amdatu.auth.config</include>
- <include>org.amdatu.cassandra:org.amdatu.cassandra.config</include>
<include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
</includes>
<unpack>true</unpack>
Modified:
trunk/amdatu-opensocial/release-demo/src/main/resources/conf/amdatu-platform.properties
==============================================================================
---
trunk/amdatu-opensocial/release-demo/src/main/resources/conf/amdatu-platform.properties
(original)
+++
trunk/amdatu-opensocial/release-demo/src/main/resources/conf/amdatu-platform.properties
Tue May 1 09:56:29 2012
@@ -1,33 +1,35 @@
-# 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.
-
#
-# Framework config properties.
+# Copyright (c) 2010-2012 The Amdatu Foundation
+#
+# Licensed 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.
#
-# To override the packages the framework exports by default from the
-# class path, set this variable.
-#org.osgi.framework.system.packages=
-
-# To append packages to the default set of exported system packages,
-# set this value.
-# Unfortunately, Cassandra uses a cliffc lib which contains a class
'org.cliffc.high_scale_lib.NonBlockingHashMap'
-# This class imports the com.sun package and so it must be exposed here.
-org.osgi.framework.system.packages.extra=sun.misc,com.sun.management,org.w3c.dom.traversal
+#
+# Amdatu Platform core configuration properties for the Apache Felix
+# OSGi container.
+#
+# In general there should be as little as possible generic configuration
+# in this file. Avoid any project specific settings as they will may
+# conflict with other modules and may even fail in a managed cloud
+# deployment. As a rule off thumb:
+#
+# 1) Configuration must be done through ConfigurationAdmin in the
+# correct (tenant) configuration space.
+# 2) Specific classloading settings, both bootdelegation and framework
+# packages, should be avoided at all cost.
+#
+# In short.. do not touch this file unless you know what you are doing.
+#
# The following property makes specified packages from the class path
# available to all bundles. You should avoid using this property.
@@ -38,11 +40,22 @@
# is enabled by default, uncomment the following line to disable it.
#felix.bootdelegation.implicit=false
+# To override the packages the framework exports by default from the
+# class path, set this variable.
+#org.osgi.framework.system.packages=
+
+# To append packages to the default set of exported system packages,
+# set this value.
+org.osgi.framework.system.packages.extra= \
+ sun.misc, \
+ com.sun.management, \
+ org.w3c.dom.traversal
+
# The following property explicitly specifies the location of the bundle
# cache, which defaults to "felix-cache" in the current working directory.
# If this value is not absolute, then the felix.cache.rootdir controls
# how the absolute location is calculated. (See next property)
-org.osgi.framework.storage=felix-deploy
+#org.osgi.framework.storage=felix-cache
# The following property is used to convert a relative bundle cache
# location into an absolute one by specifying the root to prepend to
@@ -50,69 +63,18 @@
# current working directory.
felix.cache.rootdir=work/cache
-# The following property controls whether the bundle cache is flushed
-# the first time the framework is initialized. Possible values are
-# "none" and "onFirstInit"; the default is "none".
-#org.osgi.framework.storage.clean=onFirstInit
-
-# The following property determines which actions are performed when
-# processing the auto-deploy directory. It is a comma-delimited list of
-# the following values: 'install', 'start', 'update', and 'uninstall'.
-# An undefined or blank value is equivalent to disabling auto-deploy
-# processing.
-#felix.auto.deploy.action=install,start,update,uninstall
-
-# The following property specifies the directory to use as the bundle
-# auto-deploy directory; the default is 'bundle' in the working directory.
-#felix.auto.deploy.dir=lib
-
-# The following property is a space-delimited list of bundle URLs
-# to install when the framework starts. The ending numerical component
-# is the target start level. Any number of these properties may be
-# specified for different start levels.
-#felix.auto.install.5=
-
# The following property is a space-delimited list of bundle URLs
# to install and start when the framework starts. The ending numerical
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1= \
-
reference:file:lib/org.osgi.compendium-${org.osgi.version}.jar \
-
reference:file:lib/org.apache.felix.configadmin-${org.apache.felix.configadmin.version}.jar
\
-
reference:file:lib/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
-
reference:file:lib/org.apache.felix.dependencymanager.shell-${org.apache.felix.dependencymanager.version}.jar
\
-
reference:file:lib/org.apache.felix.eventadmin-${org.apache.felix.eventadmin.version}.jar
\
-
reference:file:lib/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
-
reference:file:lib/org.apache.felix.log-${org.apache.felix.log.version}.jar \
-
reference:file:lib/org.apache.felix.metatype-${org.apache.felix.metatype.version}.jar
\
-
reference:file:lib/org.apache.felix.shell.tui-${org.apache.felix.shell.tui.version}.jar
\
-
reference:file:lib/org.apache.felix.shell-${org.apache.felix.shell.version}.jar
\
-
reference:file:lib/org.apache.felix.webconsole-${org.apache.felix.webconsole.version}.jar
\
-
reference:file:lib/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
\
-
reference:file:lib/org.apache.felix.scr-${org.apache.felix.scr.version}.jar \
-
reference:file:lib/org.apache.felix.prefs-${org.apache.felix.prefs.version}.jar
\
-
reference:file:lib/pax-useradmin-service-${pax.useradmin.version}.jar
-
-# Sets the initial start level of the framework upon startup.
-#org.osgi.framework.startlevel.beginning=1
-
-# Sets the start level of newly installed bundles.
-#felix.startlevel.bundle=1
-
-# Felix installs a stream and content handler factories by default,
-# uncomment the following line to not install them.
-#felix.service.urlhandlers=false
-
-# The launcher registers a shutdown hook to cleanly stop the framework
-# by default, uncomment the following line to disable it.
-#felix.shutdown.hook=false
-
-# Config of config admin
-felix.cm.dir=${maven.dollar}{user.dir}/work/configadmin
+ reference:file:lib/org.osgi.compendium-4.2.0.jar \
+ reference:file:lib/org.apache.felix.fileinstall-3.1.10.jar
-# Config of file install
+# Configuration for file install in a local development scenario. It
+# should not be deployed and enabled in a real world deployment.
felix.fileinstall.poll=3000
-felix.fileinstall.dir=deploy
+felix.fileinstall.dir=multitenantweb,deploy
felix.fileinstall.debug=1
felix.fileinstall.bundles.new.start=true
felix.fileinstall.filter=.*
Added:
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-core-config.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-core-config.xml
Tue May 1 09:56:29 2012
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+</MetaData>
Added:
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-web-config.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/release-demo/src/main/resources/config/amdatu-web-config.xml
Tue May 1 09:56:29 2012
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+ <OCD name="Apache Felix Http Config" id="org.osgi.service.http">
+ <AD id="org.osgi.service.http.port" type="STRING" cardinality="0" />
+ </OCD>
+ <Designate pid="org.apache.felix.http" bundle="*">
+ <Object ocdref="org.osgi.service.http">
+ <Attribute adref="org.osgi.service.http.port">
+ <Value>${amdatu.http.port}</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</MetaData>
Added:
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.web.rest.wink.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/release-demo/src/main/resources/config/org.amdatu.web.rest.wink.xml
Tue May 1 09:56:29 2012
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.0.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+ <OCD name="Amdatu Web REST Wink Configuration" id="org.amdatu.web.rest">
+ <AD id="wink.rest.path" type="STRING" cardinality="0" />
+ </OCD>
+ <Designate pid="org.amdatu.web.rest.wink" bundle="*">
+ <Object ocdref="org.amdatu.web.rest">
+ <Attribute adref="wink.rest.path">
+ <Value>/rest</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</MetaData>
\ No newline at end of file
Added:
trunk/amdatu-opensocial/release-demo/src/main/resources/config/tenant-tenant1.xml
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/release-demo/src/main/resources/config/tenant-tenant1.xml
Tue May 1 09:56:29 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Example tenant configuration with an extended local OCD definition. This will
be be delivered to the
+platform ConfigurationAdmin that manages the tenant factory. The filter allows
both the explicit
+"platform" tenantPid as well as no tenantPid for a non MT scenario.
+
+ -->
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+ <OCD name="Amdatu Tenant Custom Configuration" id="org.amdatu.tenant.custom">
+ <AD id="org.amdatu.tenant.pid" type="STRING" cardinality="0" />
+ <AD id="org.amdatu.tenant.name" type="STRING" cardinality="0" />
+ <AD id="org.amdatu.web.hostnames" type="STRING" cardinality="10" />
+ </OCD>
+ <Designate pid="org.amdatu.tenant.factory.1"
factoryPid="org.amdatu.tenant.factory" bundle="*">
+ <Object ocdref="org.amdatu.tenant.custom">
+ <Attribute adref="org.amdatu.tenant.pid">
+ <Value>${amdatu.tenant.id}</Value>
+ </Attribute>
+ <Attribute adref="org.amdatu.tenant.name">
+ <Value>${amdatu.tenant.name}</Value>
+ </Attribute>
+ <Attribute adref="org.amdatu.web.hostnames">
+ <Value>${amdatu.http.hostname}</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</MetaData>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
