Author: reto
Date: Wed Jan 5 17:40:44 2011
New Revision: 1055551
URL: http://svn.apache.org/viewvc?rev=1055551&view=rev
Log:
CLEREZZA-389:introducing various profiles, ommitting non-relase and integration
test modules by default
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/pom.xml?rev=1055551&r1=1055550&r2=1055551&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/pom.xml
Wed Jan 5 17:40:44 2011
@@ -12,8 +12,24 @@
<name>Clerezza - Triaxrs Parent</name>
<description>Parent projects for Triaxrs, a JAX-RS implementation for
OSGi.
See the org.apache.clerezza.triaxrs module for
documentation</description>
- <modules>
- <module>org.apache.clerezza.triaxrs</module>
- <module>org.apache.clerezza.triaxrs.tests</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>org.apache.clerezza.triaxrs</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>it</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+
<module>org.apache.clerezza.triaxrs.tests</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=1055551&r1=1055550&r2=1055551&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Wed Jan 5
17:40:44 2011
@@ -18,110 +18,134 @@
<distribution>repo</distribution>
</license>
</licenses>
- <modules>
- <module>org.apache.clerezza.app.webguiexamples</module>
- <module>org.apache.clerezza.ext.com.hp.hpl.jena</module>
- <module>org.apache.clerezza.ext.com.hp.hpl.jena.tdb</module>
- <module>org.apache.clerezza.ext.com.ibm.icu</module>
- <module>org.apache.clerezza.ext.javax.mail</module>
- <module>org.apache.clerezza.ext.org.jruby</module>
- <module>org.apache.clerezza.ext.org.json.simple</module>
- <module>org.apache.clerezza.ext.org.openrdf.sesame</module>
- <module>org.apache.clerezza.integrationtest.web</module>
-
<module>org.apache.clerezza.integrationtest.web.performance</module>
- <module>org.apache.clerezza.internal.archetype</module>
- <module>org.apache.clerezza.jaxrs.extensions</module>
- <module>org.apache.clerezza.jaxrs.rdf.providers</module>
- <module>org.apache.clerezza.jaxrs.testutils</module>
- <module>org.apache.clerezza.jaxrs.utils</module>
- <module>org.apache.clerezza.maven-jaxrs-report-plugin</module>
- <module>org.apache.clerezza.maven-ontologies-plugin</module>
- <module>org.apache.clerezza.maven-pladoc-plugin</module>
- <module>org.apache.clerezza.permissiondescriptions</module>
- <module>org.apache.clerezza.ssl.keygen</module>
- <module>org.apache.clerezza.platform</module>
-
<module>org.apache.clerezza.platform.accountcontrolpanel</module>
- <module>org.apache.clerezza.platform.concepts</module>
- <module>org.apache.clerezza.platform.config</module>
- <module>org.apache.clerezza.platform.config.gui</module>
-
<module>org.apache.clerezza.platform.content.imagemetadata</module>
- <module>org.apache.clerezza.platform.content</module>
- <module>org.apache.clerezza.platform.content.default404</module>
- <module>org.apache.clerezza.platform.content.fsadaptor</module>
-
<module>org.apache.clerezza.platform.content.representations</module>
- <module>org.apache.clerezza.platform.curieprefixmanager</module>
- <module>org.apache.clerezza.platform.dashboard</module>
-
<module>org.apache.clerezza.platform.dashboard.webinterface</module>
-
<module>org.apache.clerezza.platform.defaultacceptheader</module>
- <module>org.apache.clerezza.platform.documentation</module>
-
<module>org.apache.clerezza.platform.documentation.viewer</module>
- <module>org.apache.clerezza.platform.enrichment</module>
-
<module>org.apache.clerezza.platform.graphprovider.content</module>
- <module>org.apache.clerezza.platform.language</module>
- <module>org.apache.clerezza.platform.launcher.sesame</module>
-
<module>org.apache.clerezza.platform.launcher.storageless.parent</module>
- <module>org.apache.clerezza.platform.launcher.tdb</module>
- <module>org.apache.clerezza.platform.logging</module>
- <module>org.apache.clerezza.platform.mail</module>
- <module>org.apache.clerezza.platform.scripting</module>
-
<module>org.apache.clerezza.platform.scripting.scriptmanager</module>
-
<module>org.apache.clerezza.platform.security.auth.basic</module>
-
<module>org.apache.clerezza.platform.security.auth.cookie</module>
- <module>org.apache.clerezza.platform.security.foafssl</module>
-
<module>org.apache.clerezza.platform.security.conditions</module>
- <module>org.apache.clerezza.platform.security</module>
- <module>org.apache.clerezza.platform.testing</module>
- <module>org.apache.clerezza.platform.typehandlerspace</module>
-
<module>org.apache.clerezza.platform.typerendering.manager</module>
- <module>org.apache.clerezza.platform.typerendering</module>
-
<module>org.apache.clerezza.platform.typerendering.scala</module>
-
<module>org.apache.clerezza.platform.typerendering.scalaserverpages</module>
-
<module>org.apache.clerezza.platform.typerendering.seedsnipe</module>
- <module>org.apache.clerezza.platform.usermanager</module>
-
<module>org.apache.clerezza.platform.usermanager.webinterface</module>
- <module>org.apache.clerezza.platform.users</module>
- <module>org.apache.clerezza.platform.xhtml2html</module>
- <module>org.apache.clerezza.rdf.core</module>
- <module>org.apache.clerezza.rdf.core.test</module>
- <module>org.apache.clerezza.rdf.enrichment</module>
- <module>org.apache.clerezza.rdf.file.storage</module>
- <module>org.apache.clerezza.rdf.jena.commons</module>
- <module>org.apache.clerezza.rdf.jena.facade</module>
- <module>org.apache.clerezza.rdf.jena.parser</module>
- <module>org.apache.clerezza.rdf.jena.serializer</module>
- <module>org.apache.clerezza.rdf.jena.sparql</module>
- <module>org.apache.clerezza.rdf.jena.storage</module>
- <module>org.apache.clerezza.rdf.jena.tdb.storage</module>
- <module>org.apache.clerezza.rdf.locking</module>
- <module>org.apache.clerezza.rdf.ontologies</module>
- <module>org.apache.clerezza.rdf.metadata</module>
- <module>org.apache.clerezza.rdf.rdfa</module>
- <module>org.apache.clerezza.rdf.rdfjson</module>
- <module>org.apache.clerezza.rdf.scala.utils</module>
- <module>org.apache.clerezza.rdf.schemagen</module>
- <module>org.apache.clerezza.rdf.sesame.storage</module>
- <module>org.apache.clerezza.rdf.simple.storage</module>
- <module>org.apache.clerezza.rdf.utils</module>
- <module>org.apache.clerezza.rdf.web</module>
- <module>org.apache.clerezza.shell</module>
- <module>org.apache.clerezza.shell.felixshellcommand</module>
- <module>org.apache.clerezza.sshshell</module>
- <module>org.apache.clerezza.templating</module>
- <module>org.apache.clerezza.templating.seedsnipe</module>
- <module>org.apache.clerezza.tools.offline</module>
- <module>org.apache.clerezza.triaxrs</module>
- <module>org.apache.clerezza.uima</module>
- <module>org.apache.clerezza.utils.customproperty</module>
- <module>org.apache.clerezza.utils.imagemagick</module>
- <module>org.apache.clerezza.utils.imageprocessing</module>
- <module>org.apache.clerezza.utils</module>
- <module>org.apache.clerezza.web.fileserver</module>
- <module>org.apache.clerezza.web.resources.jquery</module>
- <module>org.apache.clerezza.web.resources.scripts</module>
- <module>org.apache.clerezza.web.resources.style</module>
- <module>org.apache.clerezza.web.resources.yui</module>
- <module>org.apache.clerezza.rdf.storage.externalizer</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+
<module>org.apache.clerezza.app.webguiexamples</module>
+
<module>org.apache.clerezza.ext.com.hp.hpl.jena</module>
+
<module>org.apache.clerezza.ext.com.hp.hpl.jena.tdb</module>
+
<module>org.apache.clerezza.ext.com.ibm.icu</module>
+
<module>org.apache.clerezza.ext.javax.mail</module>
+
<module>org.apache.clerezza.ext.org.json.simple</module>
+
<module>org.apache.clerezza.internal.archetype</module>
+
<module>org.apache.clerezza.jaxrs.extensions</module>
+
<module>org.apache.clerezza.jaxrs.rdf.providers</module>
+
<module>org.apache.clerezza.jaxrs.testutils</module>
+ <module>org.apache.clerezza.jaxrs.utils</module>
+
<module>org.apache.clerezza.maven-jaxrs-report-plugin</module>
+
<module>org.apache.clerezza.maven-ontologies-plugin</module>
+
<module>org.apache.clerezza.maven-pladoc-plugin</module>
+
<module>org.apache.clerezza.permissiondescriptions</module>
+ <module>org.apache.clerezza.ssl.keygen</module>
+ <module>org.apache.clerezza.platform</module>
+
<module>org.apache.clerezza.platform.accountcontrolpanel</module>
+
<module>org.apache.clerezza.platform.concepts</module>
+
<module>org.apache.clerezza.platform.config</module>
+
<module>org.apache.clerezza.platform.config.gui</module>
+
<module>org.apache.clerezza.platform.content.imagemetadata</module>
+
<module>org.apache.clerezza.platform.content</module>
+
<module>org.apache.clerezza.platform.content.default404</module>
+
<module>org.apache.clerezza.platform.content.fsadaptor</module>
+
<module>org.apache.clerezza.platform.content.representations</module>
+
<module>org.apache.clerezza.platform.curieprefixmanager</module>
+
<module>org.apache.clerezza.platform.dashboard</module>
+
<module>org.apache.clerezza.platform.dashboard.webinterface</module>
+
<module>org.apache.clerezza.platform.defaultacceptheader</module>
+
<module>org.apache.clerezza.platform.documentation</module>
+
<module>org.apache.clerezza.platform.documentation.viewer</module>
+
<module>org.apache.clerezza.platform.enrichment</module>
+
<module>org.apache.clerezza.platform.graphprovider.content</module>
+
<module>org.apache.clerezza.platform.language</module>
+
<module>org.apache.clerezza.platform.launcher.storageless.parent</module>
+
<module>org.apache.clerezza.platform.launcher.tdb</module>
+
<module>org.apache.clerezza.platform.logging</module>
+
<module>org.apache.clerezza.platform.mail</module>
+
<module>org.apache.clerezza.platform.scripting</module>
+
<module>org.apache.clerezza.platform.scripting.scriptmanager</module>
+
<module>org.apache.clerezza.platform.security.auth.basic</module>
+
<module>org.apache.clerezza.platform.security.auth.cookie</module>
+
<module>org.apache.clerezza.platform.security.foafssl</module>
+
<module>org.apache.clerezza.platform.security.conditions</module>
+
<module>org.apache.clerezza.platform.security</module>
+
<module>org.apache.clerezza.platform.typehandlerspace</module>
+
<module>org.apache.clerezza.platform.typerendering.manager</module>
+
<module>org.apache.clerezza.platform.typerendering</module>
+
<module>org.apache.clerezza.platform.typerendering.scala</module>
+
<module>org.apache.clerezza.platform.typerendering.scalaserverpages</module>
+
<module>org.apache.clerezza.platform.typerendering.seedsnipe</module>
+
<module>org.apache.clerezza.platform.usermanager</module>
+
<module>org.apache.clerezza.platform.usermanager.webinterface</module>
+
<module>org.apache.clerezza.platform.users</module>
+
<module>org.apache.clerezza.platform.xhtml2html</module>
+ <module>org.apache.clerezza.rdf.core</module>
+
<module>org.apache.clerezza.rdf.core.test</module>
+
<module>org.apache.clerezza.rdf.enrichment</module>
+
<module>org.apache.clerezza.rdf.file.storage</module>
+
<module>org.apache.clerezza.rdf.jena.commons</module>
+
<module>org.apache.clerezza.rdf.jena.facade</module>
+
<module>org.apache.clerezza.rdf.jena.parser</module>
+
<module>org.apache.clerezza.rdf.jena.serializer</module>
+
<module>org.apache.clerezza.rdf.jena.sparql</module>
+
<module>org.apache.clerezza.rdf.jena.storage</module>
+
<module>org.apache.clerezza.rdf.jena.tdb.storage</module>
+ <module>org.apache.clerezza.rdf.locking</module>
+
<module>org.apache.clerezza.rdf.ontologies</module>
+
<module>org.apache.clerezza.rdf.metadata</module>
+ <module>org.apache.clerezza.rdf.rdfa</module>
+ <module>org.apache.clerezza.rdf.rdfjson</module>
+
<module>org.apache.clerezza.rdf.scala.utils</module>
+
<module>org.apache.clerezza.rdf.schemagen</module>
+
<module>org.apache.clerezza.rdf.simple.storage</module>
+ <module>org.apache.clerezza.rdf.utils</module>
+ <module>org.apache.clerezza.rdf.web</module>
+ <module>org.apache.clerezza.shell</module>
+
<module>org.apache.clerezza.shell.felixshellcommand</module>
+ <module>org.apache.clerezza.sshshell</module>
+ <module>org.apache.clerezza.templating</module>
+
<module>org.apache.clerezza.templating.seedsnipe</module>
+
<module>org.apache.clerezza.tools.offline</module>
+ <module>org.apache.clerezza.triaxrs</module>
+ <module>org.apache.clerezza.uima</module>
+
<module>org.apache.clerezza.utils.customproperty</module>
+
<module>org.apache.clerezza.utils.imagemagick</module>
+
<module>org.apache.clerezza.utils.imageprocessing</module>
+ <module>org.apache.clerezza.utils</module>
+
<module>org.apache.clerezza.web.fileserver</module>
+
<module>org.apache.clerezza.web.resources.jquery</module>
+
<module>org.apache.clerezza.web.resources.scripts</module>
+
<module>org.apache.clerezza.web.resources.style</module>
+
<module>org.apache.clerezza.web.resources.yui</module>
+
<module>org.apache.clerezza.rdf.storage.externalizer</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>it</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+
<module>org.apache.clerezza.integrationtest.web</module>
+
<module>org.apache.clerezza.integrationtest.web.performance</module>
+
<module>org.apache.clerezza.platform.testing</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>additions</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+
<module>org.apache.clerezza.ext.org.jruby</module>
+
<module>org.apache.clerezza.ext.org.openrdf.sesame</module>
+
<module>org.apache.clerezza.platform.launcher.sesame</module>
+
<module>org.apache.clerezza.rdf.sesame.storage</module>
+ </modules>
+ </profile>
+ </profiles>
<build>
<pluginManagement>
<plugins>
@@ -258,13 +282,13 @@
<artifactId>maven-scala-plugin</artifactId>
<version>2.9.1</version>
<executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
+ <execution>
+ <goals>
+
<goal>compile</goal>
+
<goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>net.sf.alchim</groupId>
@@ -863,11 +887,11 @@
<artifactId>jsslutils</artifactId>
<version>1.0.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.ssl.keygen.base</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.ssl.keygen.base</artifactId>
+ <version>0.5-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>jetty-osgi-httpservice</artifactId>