You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/02/10 11:40:33 UTC

svn commit: r908441 - in /incubator/clerezza/trunk/org.apache.clerezza.parent: ./ org.apache.clerezza.ext.org.mulgara/ org.apache.clerezza.ext.org.openrdf.sesame/ org.apache.clerezza.jaxrs.testutils/ org.apache.clerezza.platform.launcher.storageless.pa...

Author: reto
Date: Wed Feb 10 10:40:32 2010
New Revision: 908441

URL: http://svn.apache.org/viewvc?rev=908441&view=rev
Log:
CLEREZZA-101: updated wrhapi, removed unneded external repositories

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.mulgara/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.openrdf.sesame/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.jaxrs.testutils/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/   (props changed)
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.mulgara.storage/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.scala/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.menumanager/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.mulgara/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.mulgara/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.mulgara/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.mulgara/pom.xml Wed Feb 10 10:40:32 2010
@@ -92,9 +92,23 @@
 	</build>
 	<repositories>
 		<repository>
-			<id>codehaus</id>
-			<name>Maven Codehaus repository</name>
-			<url>http://repository.codehaus.org/</url>
+			<id>trialox-ext</id>
+			<name>Trialox provided bundles for external projects</name>
+			<url>http://repo.trialox.org/ext/</url>
+		</repository>
+		<repository>
+			<id>sun</id>
+			<name>sun java repository</name>
+			<releases>
+				<updatePolicy>interval:60</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</snapshots>
+			<url>http://download.java.net/maven/2/</url>
+			<layout>default</layout>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.openrdf.sesame/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.openrdf.sesame/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.openrdf.sesame/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.org.openrdf.sesame/pom.xml Wed Feb 10 10:40:32 2010
@@ -72,4 +72,11 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<repository>
+			<id>aduna</id>
+			<name>Aduna releases</name>
+			<url>http://repo.aduna-software.org/maven2/releases/</url>
+		</repository>
+	</repositories>
 </project>
\ No newline at end of file

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.jaxrs.testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.jaxrs.testutils/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.jaxrs.testutils/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.jaxrs.testutils/pom.xml Wed Feb 10 10:40:32 2010
@@ -18,7 +18,6 @@
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi-jetty</artifactId>
-			<version>0.7</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -41,4 +40,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 10 10:40:32 2010
@@ -1 +1,2 @@
 target
+.pom.xml.swp

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml Wed Feb 10 10:40:32 2010
@@ -47,7 +47,6 @@
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi-osgi</artifactId>
-			<version>0.2</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -406,4 +405,22 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<repositories>
+		<repository>
+			<!-- org.scala-lang-osgi is not in central repo -->
+			<id>scala-tools</id>
+			<name>Scala tools</name>
+			<url>http://scala-tools.org/repo-releases/</url>
+		</repository>
+		<repository>
+			<id>sun</id>
+			<name>sun java repository</name>
+			<releases>
+				<!-- com.sun.script.jruby is not in central repo -->
+				<updatePolicy>interval:60</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<url>http://download.java.net/maven/2/</url>
+		</repository>
+	</repositories>
 </project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml Wed Feb 10 10:40:32 2010
@@ -358,7 +358,6 @@
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi-osgi</artifactId>
-			<version>0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza.ext</groupId>
@@ -414,11 +413,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
+	<!-- <repositories>
 		<repository>
 			<id>codehaus-repository</id>
 			<name>Codehaus Repository</name>
 			<url>http://repository.codehaus.org</url>
 		</repository>
-	</repositories>
-</project>
\ No newline at end of file
+	</repositories> -->
+</project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.mulgara.storage/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.mulgara.storage/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.mulgara.storage/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.mulgara.storage/pom.xml Wed Feb 10 10:40:32 2010
@@ -59,4 +59,20 @@
 			<artifactId>org.osgi.core</artifactId>
 		</dependency>
 	</dependencies>
+	<repositories>
+		<repository>
+			<id>trialox-ext</id>
+			<name>Trialox provided bundles for external projects</name>
+			<url>http://repo.trialox.org/ext/</url>
+		</repository>
+		<repository>
+			<id>sun</id>
+			<name>sun java repository</name>
+			<releases>
+				<updatePolicy>interval:60</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<url>http://download.java.net/maven/2/</url>
+		</repository>
+	</repositories>
 </project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.scala/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.scala/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.scala/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.scala/pom.xml Wed Feb 10 10:40:32 2010
@@ -11,21 +11,21 @@
 	<packaging>bundle</packaging>
 	<name>Clerezza - Scala support</name>
 	<description>OSGi bundle providing a service org.apache.clerezza.scala.service.ScalaService for interpreting scala code - see ScalaDocs</description>
-	<repositories>
+	<!-- <repositories>
 		<repository>
 			<id>scala-tools.org</id>
 			<name>Scala-Tools Maven2 Repository</name>
 			<url>http://scala-tools.org/repo-releases</url>
 		</repository>
-	</repositories>
+	</repositories> -->
 
-	<pluginRepositories>
+	<!-- <pluginRepositories>
 		<pluginRepository>
 			<id>scala-tools.org</id>
 			<name>Scala-Tools Maven2 Repository</name>
 			<url>http://scala-tools.org/repo-releases</url>
 		</pluginRepository>
-	</pluginRepositories>
+	</pluginRepositories> -->
 
 	<dependencies>
 		<dependency>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml Wed Feb 10 10:40:32 2010
@@ -34,7 +34,6 @@
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi-osgi</artifactId>
 			<scope>provided</scope>
-			<version>0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza.ext</groupId>
@@ -133,11 +132,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
+	<!-- <repositories>
 		<repository>
 			<id>codehaus-repository</id>
 			<name>Codehaus Repository</name>
 			<url>http://repository.codehaus.org</url>
 		</repository>
-	</repositories>
+	</repositories> -->
 </project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/pom.xml Wed Feb 10 10:40:32 2010
@@ -181,11 +181,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
+	<!-- <repositories>
 		<repository>
 			<id>codehaus-repository</id>
 			<name>Codehaus Repository</name>
 			<url>http://repository.codehaus.org</url>
 		</repository>
-	</repositories>
+	</repositories> -->
 </project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/pom.xml Wed Feb 10 10:40:32 2010
@@ -121,25 +121,21 @@
 		<dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam</artifactId>
-			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam-junit</artifactId>
-			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam-container-default</artifactId>
-			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi-osgi</artifactId>
-			<version>0.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -195,11 +191,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
+	<!-- <repositories>
 		<repository>
 			<id>codehaus-repository</id>
 			<name>Codehaus Repository</name>
 			<url>http://repository.codehaus.org</url>
 		</repository>
-	</repositories>
+	</repositories> -->
 </project>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.menumanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.menumanager/pom.xml?rev=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.menumanager/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.menumanager/pom.xml Wed Feb 10 10:40:32 2010
@@ -37,173 +37,10 @@
 			<groupId>org.apache.clerezza</groupId>
 			<artifactId>org.apache.clerezza.platform.content</artifactId>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>saxon</artifactId>
 			<version>8.7</version>
-		</dependency>
+		</dependency> -->
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<!-- Version 2.6  passes invalid arguments to the wadl doclet -->
-				<version>2.4</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>javadoc</goal>
-						</goals>
-						<phase>compile</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<verbose>false</verbose>
-					<show>public</show>
-					<subpackages>org.apache.clerezza.platform.menumanager</subpackages>
-					<doclet>com.sun.jersey.wadl.resourcedoc.ResourceDoclet</doclet>
-					<docletArtifacts>
-						<docletArtifact>
-							<groupId>com.sun.jersey.contribs</groupId>
-							<artifactId>wadl-resourcedoc-doclet</artifactId>
-							<version>${jersey-release-version}</version>
-						</docletArtifact>
-						<docletArtifact>
-							<groupId>com.sun.jersey</groupId>
-							<artifactId>jersey-server</artifactId>
-							<version>${jersey-release-version}</version>
-						</docletArtifact>
-						<docletArtifact>
-							<groupId>xerces</groupId>
-							<artifactId>xercesImpl</artifactId>
-							<version>2.6.1</version>
-						</docletArtifact>
-					</docletArtifacts>
-					<additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>com.sun.jersey.contribs</groupId>
-				<artifactId>maven-wadl-plugin</artifactId>
-				<version>${jersey-release-version}</version>
-				<executions>
-					<execution>
-						<id>generate</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<phase>compile</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<wadlFile>${project.build.outputDirectory}/application.wadl</wadlFile>
-					<formatWadlFile>true</formatWadlFile>
-					<baseUri>http://www.example.com/api</baseUri>
-					<packagesResourceConfig>
-						<param>org.apache.clerezza.platform.menumanager</param>
-					</packagesResourceConfig>
-					<wadlGenerators>
-						<wadlGeneratorDescription>
-							<className>com.sun.jersey.server.wadl.generators.WadlGeneratorApplicationDoc</className>
-							<properties>
-								<property>
-									<name>applicationDocsFile</name>
-									<value>${basedir}/src/main/doc/application-doc.xml</value>
-								</property>
-							</properties>
-						</wadlGeneratorDescription>
-						<wadlGeneratorDescription>
-							<className>com.sun.jersey.server.wadl.generators.WadlGeneratorGrammarsSupport</className>
-							<properties>
-								<property>
-									<name>grammarsFile</name>
-									<value>${basedir}/src/main/doc/application-grammars.xml</value>
-								</property>
-							</properties>
-						</wadlGeneratorDescription>
-						<wadlGeneratorDescription>
-							<className>com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport</className>
-							<properties>
-								<property>
-									<name>resourceDocFile</name>
-									<value>${project.build.outputDirectory}/resourcedoc.xml</value>
-								</property>
-							</properties>
-						</wadlGeneratorDescription>
-
-                        <!-- wadlGeneratorDescription>
-                            <className>com.sun.jersey.samples.generatewadl.util.ExampleWadlGenerator</className>
-                            <properties>
-                                <property>
-                                    <name>resourceDocFile</name>
-                                    <value>${project.build.outputDirectory}/resourcedoc.xml</value>
-                                </property>
-                            </properties>
-                        </wadlGeneratorDescription -->
-					</wadlGenerators>
-				</configuration>
-
-			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>xsltproc</id>
-			<activation>
-				<file>
-					<exists>/usr/bin/xsltproc</exists>
-				</file>
-			</activation>
-			<build>
-				<plugins>
-                    <!--  Create/generate the application.html using xsltproc  -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.1</version>
-						<executions>
-							<execution>
-								<id>exec-xsltproc: target/application.html</id>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<phase>package</phase>
-								<configuration>
-									<executable>xsltproc</executable>
-									<commandlineArgs>-o target/application.html src/main/doc/wadl_documentation.xsl target/classes/application.wadl</commandlineArgs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>maven2-repository.dev.java.net</id>
-			<url>http://download.java.net/maven/2</url>
-			<layout>default</layout>
-		</pluginRepository>
-        <!-- pluginRepository>
-            <id>maven-repository.dev.java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository -->
-	</pluginRepositories>
-	<repositories>
-		<repository>
-			<id>maven2-repository.dev.java.net</id>
-			<url>http://download.java.net/maven/2</url>
-			<layout>default</layout>
-		</repository>
-        <!-- repository>
-            <id>maven-repository.dev.java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository -->
-	</repositories>
 </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=908441&r1=908440&r2=908441&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Wed Feb 10 10:40:32 2010
@@ -280,56 +280,10 @@
 		</resources>
 	</build>
 	<repositories>
-		<repository>
-			<id>sun</id>
-			<name>sun java repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://download.java.net/maven/2/</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>wymiwyg</id>
-			<name>wymiwyg repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://wymiwyg.berlios.de/maven2/</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>aduna</id>
-			<name>aduna repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://repo.aduna-software.org/maven2/releases</url>
-			<layout>default</layout>
-		</repository>
 		<!-- for PAXEXAM-159 and 160 -->
 		<repository>
 			<id>ops4j</id>
 			<name>ops4j repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
 			<snapshots>
 				<updatePolicy>always</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
@@ -341,10 +295,6 @@
 		<repository>
 			<id>apache</id>
 			<name>apache repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
 			<snapshots>
 				<updatePolicy>always</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
@@ -352,56 +302,9 @@
 			<url>http://repository.apache.org/content/groups/snapshots-group</url>
 			<layout>default</layout>
 		</repository>
-		<repository>
-			<id>clerezza-ext</id>
-			<name>clerezza.org ext repository</name>
-			<url>http://repo.trialox.org/ext</url>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>jena</id>
-			<name>hp jena repository</name>
-			<releases>
-				<updatePolicy>interval:60</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</snapshots>
-			<url>http://openjena.org/repo/</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>scala-tools.org</id>
-			<name>Scala-Tools Maven2 Repository</name>
-			<url>http://scala-tools.org/repo-releases</url>
-		</repository>
+		
 	</repositories>
 	<pluginRepositories>
-		<pluginRepository>
-			<id>scala-tools.org</id>
-			<name>Scala-Tools Maven2 Repository</name>
-			<url>http://scala-tools.org/repo-releases</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>trialox-plugin-release</id>
-			<name>trialox.org distribution repository</name>
-			<url>http://repo.trialox.org/release</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>trialox-plugin-snapshot</id>
-			<name>trialox.org snapshot repository</name>
-			<url>http://repo.trialox.org/snapshot</url>
-		</pluginRepository>
 		<!-- for a version that fixed PAXEXAM-159 and 160 -->
 		<pluginRepository>
 			<id>ops4j-plugin-snapshot</id>
@@ -792,7 +695,17 @@
 			<dependency>
 				<groupId>org.wymiwyg</groupId>
 				<artifactId>wrhapi</artifactId>
-				<version>0.8</version>
+				<version>0.8.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.wymiwyg</groupId>
+				<artifactId>wrhapi-osgi</artifactId>
+				<version>0.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.wymiwyg</groupId>
+				<artifactId>wrhapi-jetty</artifactId>
+				<version>0.8.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.wymiwyg</groupId>