Author: [email protected]
Date: Thu Apr 21 19:13:49 2011
New Revision: 1035
Log:
AMDATU-177 117 stripping platform war / moved resources into WEB-INF
Modified:
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/FrameworkService.java
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/ProvisionActivator.java
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-release/src/main/assembly/war-component.xml
Modified:
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/FrameworkService.java
==============================================================================
---
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/FrameworkService.java
(original)
+++
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/FrameworkService.java
Thu Apr 21 19:13:49 2011
@@ -118,7 +118,7 @@
File deployDir = new File(map.get("felix.fileinstall.dir").toString());
if (!deployDir.exists()) {
deployDir.mkdirs();
- String sourceDir = m_servletContext.getRealPath("/amdatu/deploy");
+ String sourceDir =
m_servletContext.getRealPath("/WEB-INF/amdatu/config");
System.out.println("Config Admin deploy directory does not exist,
copying initial configuration files from "
+ sourceDir + " to " + deployDir.getAbsolutePath());
String[] files = new File(sourceDir).list();
Modified:
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/ProvisionActivator.java
==============================================================================
---
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/ProvisionActivator.java
(original)
+++
trunk/amdatu-libraries/warsupport/src/main/java/org/amdatu/webapp/ProvisionActivator.java
Thu Apr 21 19:13:49 2011
@@ -16,7 +16,6 @@
*/
package org.amdatu.webapp;
-
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -50,21 +49,18 @@
}
}
- public void stop(BundleContext context) throws Exception{
+ 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"));
+ allBundles.addAll(loadDir("bundles"));
return allBundles;
}
- private List<URL> loadDir(String dirname) throws Exception{
+ private List<URL> loadDir(String dirname) throws Exception {
ArrayList<URL> list = new ArrayList<URL>();
- for (Object o : this.m_servletContext.getResourcePaths("/amdatu/" +
dirname + "/")) {
+ for (Object o :
this.m_servletContext.getResourcePaths("/WEB-INF/amdatu/" + dirname + "/")) {
String name = (String) o;
if (name.endsWith(".jar")) {
URL url = this.m_servletContext.getResource(name);
@@ -74,5 +70,5 @@
}
}
return list;
- }
+ }
}
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Thu Apr 21 19:13:49 2011
@@ -21,7 +21,7 @@
<org.amdatu.core.version>0.2.1-SNAPSHOT</org.amdatu.core.version>
<org.amdatu.web.version>0.2.1-SNAPSHOT</org.amdatu.web.version>
- <org.amdatu.lib.version>0.2.0</org.amdatu.lib.version>
+ <org.amdatu.lib.version>0.2.1-SNAPSHOT</org.amdatu.lib.version>
<org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
@@ -125,13 +125,6 @@
</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.resource</artifactId>
<version>${org.amdatu.web.version}</version>
<scope>runtime</scope>
@@ -336,7 +329,7 @@
</webAppConfig>
<connectors>
<connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>${server.port}</port>
+ <port>${amdatu.http.port}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
@@ -380,5 +373,34 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Profile used for war release -->
+ <id>build-war</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <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: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml Thu Apr 21
19:13:49 2011
@@ -9,25 +9,16 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.amdatu.web:*</include>
- <include>org.amdatu.web.*:*</include>
- <include>org.amdatu.core:*</include>
- <include>org.amdatu.core.*:*</include>
- </includes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
<include>org.osgi:*</include>
<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>
+ <include>org.amdatu.web:*</include>
+ <include>org.amdatu.core:*</include>
</includes>
+ <excludes>
+ <exclude>org.apache.felix:org.apache.felix.http.bridge</exclude>
+ <exclude>org.apache.felix:org.apache.felix.http.proxy</exclude>
+ </excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
Modified: trunk/amdatu-release/src/main/assembly/war-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/war-component.xml (original)
+++ trunk/amdatu-release/src/main/assembly/war-component.xml Thu Apr 21
19:13:49 2011
@@ -4,78 +4,21 @@
<!--
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.auth:*</include>
- <include>org.amdatu.auth.*:*</include>
- <include>org.amdatu.auth:*</include>
- <include>org.amdatu.auth.*:*</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>
+ <outputDirectory>WEB-INF/amdatu/bundles</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>
+ <include>org.amdatu.web:*</include>
+ <include>org.amdatu.core:*</include>
</includes>
<excludes>
- <exclude>org.apache.felix:org.apache.felix.framework</exclude>
+ <exclude>org.amdatu.core:org.amdatu.core.config.filebased</exclude>
<exclude>org.apache.felix:org.apache.felix.main</exclude>
+ <exclude>org.apache.felix:org.apache.felix.framework</exclude>
<exclude>org.apache.felix:org.apache.felix.http.proxy</exclude>
- <exclude>org.apache.felix:org.apache.felix.http.jetty</exclude>
- <exclude>org.osgi:*</exclude>
</excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -84,10 +27,10 @@
<dependencySet>
<outputDirectory>WEB-INF/lib</outputDirectory>
<includes>
- <include>org.osgi:*</include>
+ <include>org.osgi.compendium:*</include>
<include>org.apache.felix:org.apache.felix.framework</include>
<include>org.apache.felix:org.apache.felix.http.proxy</include>
- <include>org.amdatu.libraries:warsupport</include>
+ <include>org.amdatu.libraries:org.amdatu.libraries.warsupport</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -101,18 +44,8 @@
<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>
- <fileSet>
- <directory>../amdatu-cassandra/config-fileinstall</directory>
- <outputDirectory>${deploy.directory.name}</outputDirectory>
+ <directory>src/main/resources/config</directory>
+ <outputDirectory>WEB-INF/amdatu/config</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
