Author: stephanh
Date: Fri Oct 8 18:10:39 2010
New Revision: 144
Log:
Undo accidental commit
Modified:
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
trunk/example-bundles/course-service/src/main/resources/rdf/EducaData.rdf
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraConfigurationServiceImpl.java
trunk/platform-bundles/httpcontext/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
trunk/src/main/resources/shell/startup.bat
Modified:
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
(original)
+++
trunk/example-bundles/course-gadget/src/main/java/org/amdatu/example/course/gadget/osgi/Activator.java
Fri Oct 8 18:10:39 2010
@@ -23,7 +23,6 @@
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
import org.ops4j.pax.web.service.WebContainer;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseOntologyDataProvider.java
Fri Oct 8 18:10:39 2010
@@ -131,6 +131,12 @@
List<String> educations = m_sesameService.getSubjects(baseUrl +
EDUCA_ONTOLOGY_EDUCATION_URI);
// Loop over all course names and create a Course for each grade
and education
+ m_logService.log(LogService.LOG_DEBUG, "Adding " +
COURSE_NAMES.length * grades.size() * educations.size()
+ + " courses");
+ long currentTimeInMs = System.currentTimeMillis();
+ int count = 0;
+ int batchSize = grades.size() * educations.size();
+ int totalSize = COURSE_NAMES.length * batchSize;
for (String courseName : COURSE_NAMES) {
String cName = courseName.toLowerCase().replace(" ", "_");
String courseBaseURI = baseUrl + EDUCA_DATA_URI_BASE +
"/course/" + cName + "/";
@@ -153,6 +159,12 @@
connection.add(courseURI, nameProp,
factory.createLiteral(courseName));
}
}
+
+ count++;
+ long diff = System.currentTimeMillis() - currentTimeInMs;
+ currentTimeInMs = System.currentTimeMillis();
+ m_logService.log(LogService.LOG_DEBUG, batchSize + " courses
(" + count * batchSize + " of "
+ + totalSize + ") added in " + diff + " ms");
}
} catch (IOException e) {
m_logService.log(LogService.LOG_ERROR, "Failed to store Courses in
RDF database", e);
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseResource.java
Fri Oct 8 18:10:39 2010
@@ -119,17 +119,11 @@
if (user != null) {
// Loop over all person services until we found a service
that knows this person (which
// means the person is available in that tenant).
- ServiceReference[] serviceReferences =
m_bundleContext.getServiceReferences(PersonService.class.getName(),
"(context=profile)");
- if (serviceReferences != null && serviceReferences.length
> 0) {
- for (ServiceReference serviceReference :
serviceReferences) {
- PersonService personService = (PersonService)
m_bundleContext.getService(serviceReference);
- Person person =
personService.getPersonForProfile(profile);
- if (person != null) {
- List<Course> courses =
m_courseService.getAvailableCourses(person);
- courseList.setCourses(courses);
- return courseList;
- }
- }
+ Person person = m_personService.getPerson(user);
+ if (person != null) {
+ List<Course> courses =
m_courseService.getAvailableCourses(person);
+ courseList.setCourses(courses);
+ return courseList;
}
}
}
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/impl/CourseServiceImpl.java
Fri Oct 8 18:10:39 2010
@@ -39,10 +39,10 @@
*/
public class CourseServiceImpl implements CourseService {
// Services injected by the Felix dependency manager
- private LogService m_logService;
- private SesameService m_sesameService;
- private ConfigurationAdmin m_configAdmin;
-
+ private volatile LogService m_logService;
+ private volatile SesameService m_sesameService;
+ private volatile ConfigurationAdmin m_configAdmin;
+
/**
* Returns the list of available courses.
*/
Modified:
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
(original)
+++
trunk/example-bundles/course-service/src/main/java/org/amdatu/example/course/service/osgi/Activator.java
Fri Oct 8 18:10:39 2010
@@ -16,9 +16,7 @@
*/
package org.amdatu.example.course.service.osgi;
-import org.amdatu.example.course.service.ConfigurationService;
import org.amdatu.example.course.service.CourseService;
-import org.amdatu.example.course.service.impl.ConfigurationServiceImpl;
import org.amdatu.example.course.service.impl.CourseOntologyDataProvider;
import org.amdatu.example.course.service.impl.CourseResource;
import org.amdatu.example.course.service.impl.CourseServiceImpl;
@@ -52,7 +50,7 @@
public void init(BundleContext context, DependencyManager manager) throws
Exception {
// Create and register the course service
manager.add(
- createAdapterService(Tenant.class, null)
+ createComponent()
.setInterface(CourseService.class.getName(), null)
.setImplementation(CourseServiceImpl.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
Modified:
trunk/example-bundles/course-service/src/main/resources/rdf/EducaData.rdf
==============================================================================
--- trunk/example-bundles/course-service/src/main/resources/rdf/EducaData.rdf
(original)
+++ trunk/example-bundles/course-service/src/main/resources/rdf/EducaData.rdf
Fri Oct 8 18:10:39 2010
@@ -368,8 +368,8 @@
</rdf:type>
<ontology:wasBornOn
rdf:datatype="&xsd;date">22-04-1973</ontology:wasBornOn>
<ontology:hasFirstName
rdf:datatype="&xsd;string">Maija</ontology:hasFirstName>
- <ontology:name rdf:datatype="&xsd;string">Maija
Meik?l?inen</ontology:name>
- <ontology:hasLastName
rdf:datatype="&xsd;string">Meik?l?inen</ontology:hasLastName>
+ <ontology:name rdf:datatype="&xsd;string">Maija
Meik\u00e4l\u00e4inen</ontology:name>
+ <ontology:hasLastName
rdf:datatype="&xsd;string">Meik\u00e4l\u00e4inen</ontology:hasLastName>
<ontology:matchesProfileId
rdf:datatype="&xsd;string">maijam</ontology:matchesProfileId>
<ontology:teaches rdf:resource="#melissad"/>
<ontology:teaches rdf:resource="#elisad"/>
Modified:
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
==============================================================================
---
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
(original)
+++
trunk/example-bundles/friends-gadget/src/main/java/org/amdatu/example/friends/gadget/osgi/Activator.java
Fri Oct 8 18:10:39 2010
@@ -23,7 +23,6 @@
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.service.Service;
import org.ops4j.pax.web.service.WebContainer;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
Modified:
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
==============================================================================
---
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
(original)
+++
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/osgi/Activator.java
Fri Oct 8 18:10:39 2010
@@ -18,11 +18,13 @@
import org.amdatu.platform.authorization.AuthorizationService;
import org.amdatu.platform.authorization.service.AuthorizationServiceImpl;
+import org.amdatu.platform.configtemplatemanager.ConfigTemplateManager;
import org.amdatu.platform.httpcontext.HttpContextServiceFactory;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.ops4j.pax.web.service.WebContainer;
import org.osgi.framework.BundleContext;
+import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.UserAdmin;
@@ -47,6 +49,8 @@
.setImplementation(AuthorizationServiceImpl.class)
.add(createServiceDependency().setService(HttpContextServiceFactory.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true))
+
.add(createServiceDependency().setService(ConfigurationAdmin.class).setRequired(true))
+
.add(createServiceDependency().setService(ConfigTemplateManager.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
.add(createServiceDependency().setService(WebContainer.class).setRequired(true)));
}
Modified:
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
(original)
+++
trunk/platform-bundles/authorization-service/src/main/java/org/amdatu/platform/authorization/service/AuthorizationServiceImpl.java
Fri Oct 8 18:10:39 2010
@@ -102,7 +102,7 @@
adminUser.getProperties().put(USER_NAME_CREDENTIAL_KEY,
DEFAULT_USERNAME);
Group adminGroup = (Group)
m_userAdmin.createRole(DEFAULT_ADMIN_GROUP, Role.GROUP);
adminGroup.addMember(adminUser);
-
+
// Remember we initialized the service
properties = new Hashtable<String, String>();
properties.put(INITIALIZED_KEY, "true");
@@ -161,7 +161,6 @@
public Response login(@FormParam("username") final String username,
@FormParam("password") final String password,
@Context final HttpServletRequest request) {
m_logService.log(LogService.LOG_INFO, "Login requested for user: " +
username);
- request.getSession(true);
// First retrieve the user with this username
JSONObject jsonObject = new JSONObject();
@@ -177,8 +176,8 @@
// session info in the container. Note that we use our own
http session implementation
// because of issue AMDATU-67.
BasicHttpSession session =
BasicHttpSession.getSession(request);
+ session.putValue("authorization", auth);
if (session != null) {
- session.putValue("authorization", auth);
m_logService.log(LogService.LOG_INFO, "User '" +
username + "' logged in successfully");
jsonObject.append("result", "ok");
jsonObject.append("username", username);
Modified:
trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
---
trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraConfigurationServiceImpl.java
(original)
+++
trunk/platform-bundles/cassandra-application/src/main/java/org/amdatu/platform/cassandra/application/service/CassandraConfigurationServiceImpl.java
Fri Oct 8 18:10:39 2010
@@ -25,6 +25,8 @@
import org.apache.log4j.PropertyConfigurator;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
/**
@@ -33,13 +35,16 @@
*/
public class CassandraConfigurationServiceImpl implements
CassandraConfigurationService {
// Statics
+ private static final String CONFIG_PID =
"org.amdatu.platform.cassandra.application";
+ private static final String CONFIG_WORKDIR = "workdir";
private static final String STORAGE_CONF_SOURCE = "conf/storage-conf.xml";
private static final String LOG4J_CONF_SOURCE = "conf/log4j.properties";
-
+
// Reference to the logservice
private volatile LogService m_logService;
private volatile ConfigTemplateManager m_configTemplateManager;
private volatile BundleContext m_bundleContext;
+ private volatile ConfigurationAdmin m_configurationAdmin;
// Private members
private String m_workDir;
@@ -51,6 +56,9 @@
public void init() {
m_logService.log(LogService.LOG_DEBUG, "Preparing Cassandra
configuration");
+ // Initialize work directory
+ initializeWorkdir();
+
// Initialize storage configuration
// Load the URL of the sotrage-conf.xml and write it file using the
config template
// manager, which automatically replaces configuration entries in that
file
@@ -80,4 +88,18 @@
m_logService.log(LogService.LOG_DEBUG, "Cassandra configuration
preparation completed");
}
+
+ private void initializeWorkdir() {
+ try {
+ // Initialize the work directory
+ String workBaseDir = System.getProperty("user.dir") +
File.separator + "work";
+ Configuration config =
m_configurationAdmin.getConfiguration(CONFIG_PID);
+ if (config != null) {
+ String workDir =
config.getProperties().get(CONFIG_WORKDIR).toString();
+ m_workDir = workBaseDir + File.separator + workDir;
+ }
+ } catch (IOException e) {
+ m_logService.log(LogService.LOG_ERROR, "Could not initialize
Cassandra work directory", e);
+ }
+ }
}
Modified: trunk/platform-bundles/httpcontext/pom.xml
==============================================================================
--- trunk/platform-bundles/httpcontext/pom.xml (original)
+++ trunk/platform-bundles/httpcontext/pom.xml Fri Oct 8 18:10:39 2010
@@ -38,6 +38,12 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>net.kornr.osgi</groupId>
+ <artifactId>commons-logging-osgi</artifactId>
+
<version>${net.kornr.osgi.commons-logging-osgi.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Fri Oct 8 18:10:39 2010
@@ -61,10 +61,10 @@
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
<org.apache.felix.dependencymanager.version>3.0.0-SNAPSHOT</org.apache.felix.dependencymanager.version>
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
-
<org.apache.felix.webconsole.version>3.0.0</org.apache.felix.webconsole.version>
+
<org.apache.felix.webconsole.version>3.1.0</org.apache.felix.webconsole.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.gogo.version>0.4.0</org.apache.felix.gogo.version>
+
<org.apache.felix.gogo.version>0.6.0</org.apache.felix.gogo.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
<org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
<org.openrdf.sesame.version>2.3.1</org.openrdf.sesame.version>
@@ -91,7 +91,6 @@
<module>gadget-bundles</module>
<module>libraries</module>
<module>example-bundles</module>
- <module>blueconic-bundles</module>
</modules>
<repositories>
@@ -135,7 +134,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>${org.apache.felix.main.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -160,12 +159,12 @@
<scope>provided</scope>
</dependency>
- <!-- Configuration administration service, needed by the Jetty
bundle -->
+ <!-- Configuration administration service -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${org.apache.felix.configadmin.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Log service bundle -->
@@ -173,27 +172,8 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>${org.apache.felix.log.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- File install bundle -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
-
<version>${org.apache.felix.file.install.version}</version>
- <scope>provided</scope>
- </dependency>
-
-
- <!-- Integrated jetty bundle (web container). -->
- <!-- IL: Replaced by Pax Web
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bundle</artifactId>
- <version>2.0.4</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
- -->
<!-- Use Pax Web as HTTP service implementation -->
<dependency>
@@ -220,7 +200,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>${org.apache.sling.commons.osgi.version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<!-- Dependency manager -->
@@ -236,7 +216,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<version>${org.apache.felix.metatype.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Web Console -->
@@ -244,7 +224,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<version>${org.apache.felix.webconsole.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Enable this section to enable standard Felix shell -->
@@ -252,34 +232,34 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
<version>${org.apache.felix.shell.tui.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>${org.apache.felix.shell.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<!-- Enable this section to enable the Gogo shell -->
<!--
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
<version>${org.apache.felix.gogo.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.console</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.shell</artifactId>
<version>${org.apache.felix.gogo.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.commands</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.command</artifactId>
<version>${org.apache.felix.gogo.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
-->
@@ -449,6 +429,77 @@
<version>2.6</version>
</plugin>
+ <!-- Since the Felix dependency manager 3.0.0 is not yet
available in
+ online maven repositories, it must be installed to the
local maven
+ repository. We use the maven-install-plugin to do so
during build -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+
<id>install-felix-dependency-manager</id>
+ <phase>initialize</phase>
+ <goals>
+
<goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar</file>
+
<groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.dependencymanager</artifactId>
+
<version>${org.apache.felix.dependencymanager.version}</version>
+
<packaging>jar</packaging>
+ </configuration>
+ </execution>
+
+ <execution>
+
<id>install-commons-logging-osgi-adapter</id>
+ <phase>initialize</phase>
+ <goals>
+
<goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${basedir}/src/main/resources/lib/commons-logging-osgi-20081215.jar</file>
+
<groupId>net.kornr.osgi</groupId>
+
<artifactId>commons-logging-osgi</artifactId>
+
<version>${net.kornr.osgi.commons-logging-osgi.version}</version>
+
<packaging>jar</packaging>
+ </configuration>
+ </execution>
+
+ <execution>
+
<id>install-felix-dependency-manager-shell</id>
+ <phase>initialize</phase>
+ <goals>
+
<goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar</file>
+
<groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+
<version>${org.apache.felix.dependencymanager.version}</version>
+
<packaging>jar</packaging>
+ </configuration>
+ </execution>
+
+ <execution>
+
<id>install-pax-dependency-manager</id>
+ <phase>initialize</phase>
+ <goals>
+
<goal>install-file</goal>
+ </goals>
+ <configuration>
+
<file>${basedir}/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar</file>
+
<groupId>org.ops4j.pax.useradmin</groupId>
+
<artifactId>pax-useradmin-service</artifactId>
+
<version>${pax.useradmin.version}</version>
+
<packaging>jar</packaging>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -456,7 +507,20 @@
<executions>
<!-- Copy all system bundles -->
<execution>
- <id>copy-system-bundles</id>
+
<id>copy-system-runtime-bundles</id>
+ <phase>compile</phase>
+ <goals>
+
<goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${root.directory}/system-bundles</outputDirectory>
+
<excludeTransitive>true</excludeTransitive>
+
<includeScope>runtime</includeScope>
+
<includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.apache.sling</includeGroupIds>
+ </configuration>
+ </execution>
+ <execution>
+
<id>copy-system-provided-bundles</id>
<phase>compile</phase>
<goals>
<goal>copy-dependencies</goal>
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Fri Oct 8
18:10:39 2010
@@ -70,14 +70,14 @@
# 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=file:platform-bundles/org.amdatu.shindig-app-bundle-1.1-BETA5-incubating.jar
+#felix.auto.install.5=file:platform-bundles/org.amdatu.shindig-app-bundle-0.0.4.jar
# 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.2=reference:file:platform-bundles/org.amdatu.platform.filebased-configuration-0.0.4.jar
-felix.auto.start.5=reference:file:platform-bundles/org.amdatu.platform.shindig-app-bundle-1.1-BETA5-incubating.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.httpcontext-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.sesame-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-0.0.4.jar
+felix.auto.start.5=reference:file:platform-bundles/org.amdatu.platform.shindig-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.profile-service-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.httpcontext-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.sesame-application-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-0.0.4.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-0.0.4.jar
felix.auto.start.10=reference:file:application-bundles/org.amdatu.application.dashboard-0.0.4.jar
reference:file:application-bundles/org.amdatu.application.gadgetmanagement-0.0.4.jar
felix.auto.start.20=reference:file:gadget-bundles/org.amdatu.gadget.sparqlendpoint-0.0.4.jar
reference:file:gadget-bundles/org.amdatu.gadget.login-0.0.4.jar
felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friends-gadget-0.0.4.jar
reference:file:example-bundles/org.amdatu.example.course-gadget-0.0.4.jar
reference:file:example-bundles/org.amdatu.example.course-service-0.0.4.jar
Modified: trunk/src/main/resources/shell/startup.bat
==============================================================================
--- trunk/src/main/resources/shell/startup.bat (original)
+++ trunk/src/main/resources/shell/startup.bat Fri Oct 8 18:10:39 2010
@@ -1,6 +1,3 @@
-set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
-set PATH=C:\Program Files\Java\jdk1.6.0_05\bin;%PATH%
-
rem Open a debug port
set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
@@ -9,8 +6,6 @@
rem Felix property file
set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/felix-config.properties
-set JAVA_OPTS=%JAVA_OPTS% -Dblueconic.development=true
-java %JAVA_OPTS% -jar system-bundles/org.apache.felix.main-2.0.5.jar
-rem > stdout.txt 2> stderr.txt
+java %JAVA_OPTS% -jar system-bundles/org.apache.felix.main-2.0.5.jar
