Author: [email protected]
Date: Wed Nov 23 17:32:59 2011
New Revision: 1756
Log:
AMDATU-472 Include metatype support in platform release / refactored assembly a
little
Added:
trunk/amdatu-release/src/main/resources/bin/run.bat
- copied, changed from r1751,
/trunk/amdatu-release/src/main/resources/bin/startup.bat
Removed:
trunk/amdatu-release/src/main/resources/bin/startup.bat
trunk/amdatu-release/src/main/resources/shortcuts/Amdatu dashboard.URL
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-component.xml
trunk/amdatu-release/src/main/assembly/war-component.xml
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Nov 23 17:32:59 2011
@@ -15,7 +15,8 @@
limitations under the License.verning permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
@@ -83,128 +84,10 @@
</repositories>
<dependencies>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.filebased</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.forwarder.jdk</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantstore.inmem</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.useradminstore.fs</artifactId>
- <version>${org.amdatu.core.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.amdatu.libraries</groupId>
- <artifactId>org.amdatu.libraries.warsupport</artifactId>
- <version>${org.amdatu.lib.version}</version>
- <scope>compile</scope>
- </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>
@@ -273,11 +156,9 @@
<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>
@@ -316,6 +197,118 @@
<version>${pax.useradmin.version}</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.config.templates</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.log.console</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.log.forwarder.jdk</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenant</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantstore.inmem</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.useradminstore.fs</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.core</groupId>
+ <artifactId>org.amdatu.core.fileinstall.metatype</artifactId>
+ <version>${org.amdatu.core.version}</version>
+ <scope>compile</scope>
+ </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.amdatu.libraries</groupId>
+ <artifactId>org.amdatu.libraries.warsupport</artifactId>
+ <version>${org.amdatu.lib.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
<build>
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 Wed Nov 23
17:32:59 2011
@@ -8,13 +8,16 @@
<include>org.osgi:org.osgi.compendium</include>
<include>org.apache.felix:*</include>
<include>org.ops4j.pax.useradmin:*</include>
- <include>org.amdatu.web:*</include>
+ </includes>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy</outputDirectory>
+ <includes>
<include>org.amdatu.core:*</include>
+ <include>org.amdatu.web:*</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 Wed Nov 23
17:32:59 2011
@@ -11,7 +11,6 @@
<include>org.amdatu.core:*</include>
</includes>
<excludes>
- <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>
Copied: trunk/amdatu-release/src/main/resources/bin/run.bat (from r1751,
/trunk/amdatu-release/src/main/resources/bin/startup.bat)
==============================================================================
--- /trunk/amdatu-release/src/main/resources/bin/startup.bat (original)
+++ trunk/amdatu-release/src/main/resources/bin/run.bat Wed Nov 23 17:32:59 2011
@@ -1,19 +1,19 @@
-@echo off
-
-rem Open a debug port
-set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-
-rem Set memory options
-set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
-
-rem Felix property file
-set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
-
-rem Set encoding to UTF-8
-set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
-
-echo Starting Amdatu server
-echo JAVA_OPTS=%JAVA_OPTS%
-
-java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
-
+@echo off
+
+rem Open a debug port
+set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+rem Set memory options
+set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx1024m -XX:MaxPermSize=256m
+
+rem Felix property file
+set JAVA_OPTS=%JAVA_OPTS%
-Dfelix.config.properties=file:conf/amdatu-platform.properties
+
+rem Set encoding to UTF-8
+set JAVA_OPTS=%JAVA_OPTS% -Dfile.encoding=utf-8
+
+echo Starting Amdatu server
+echo JAVA_OPTS=%JAVA_OPTS%
+
+java %JAVA_OPTS% -jar
lib/org.apache.felix.main-${org.apache.felix.main.version}.jar
+
Modified:
trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
==============================================================================
--- trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
(original)
+++ trunk/amdatu-release/src/main/resources/conf/amdatu-platform.properties
Wed Nov 23 17:32:59 2011
@@ -91,21 +91,7 @@
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 \
-
reference:file:lib/org.amdatu.core.log.console-${org.amdatu.core.version}.jar \
-
reference:file:lib/org.amdatu.core.log.forwarder.jdk-${org.amdatu.core.version}.jar
\
-
reference:file:lib/org.amdatu.core.tenant-${org.amdatu.core.version}.jar \
-
reference:file:lib/org.amdatu.core.tenantstore.inmem-${org.amdatu.core.version}.jar
\
-
reference:file:lib/org.amdatu.core.tenantuseradmindecorator-${org.amdatu.core.version}.jar
\
-
reference:file:lib/org.amdatu.core.config.templates-${org.amdatu.core.version}.jar
\
-
reference:file:lib/org.amdatu.core.useradminstore.fs-${org.amdatu.core.version}.jar
\
-
reference:file:lib/org.amdatu.web.httpcontext-${org.amdatu.web.version}.jar \
-
reference:file:lib/org.amdatu.web.dispatcher-${org.amdatu.web.version}.jar \
-
reference:file:lib/org.amdatu.web.tenantresolver.hostname-${org.amdatu.web.version}.jar
\
-
reference:file:lib/org.amdatu.web.jsp-${org.amdatu.web.version}.jar \
-
reference:file:lib/org.amdatu.web.resource-${org.amdatu.web.version}.jar \
-
reference:file:lib/org.amdatu.web.jaxrs-${org.amdatu.web.version}.jar \
-
reference:file:lib/org.amdatu.web.wink-${org.amdatu.web.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
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
