From c730703955f9e6a5e67e7ec71dc9bd4b82598427 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 30 Nov 2011 13:32:33 +0100
Subject: [PATCH] FXOLAT-378: pom clean-up and use nexus.openolat.org
---
pom.xml | 247 ++++--------------
.../java/org/olat/test/AllTestsJunit4.java | 1 -
src/test/java/org/olat/test/SpringTest.java | 101 -------
3 files changed, 50 insertions(+), 299 deletions(-)
delete mode 100644 src/test/java/org/olat/test/SpringTest.java
diff --git a/pom.xml b/pom.xml
index 0576c4018ce..b37869ea1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,25 +2,22 @@
<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>
- <groupId>org.olat</groupId>
- <artifactId>OLAT-LMS</artifactId>
+ <groupId>org.openolat</groupId>
+ <artifactId>openolat-lms</artifactId>
<version>7.1.2.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>OLAT LMS</name>
+ <name>OpenOLAT LMS</name>
<url>http://www.openolat.org</url>
<description>
- Welcome to the OLAT (Online Learning And Training) Developer Project Site. This site
+ Welcome to the OpenOLAT (Open Online Learning And Training) Developer Project Site. This site
contains materials chiefly of concern to developers (e.g., unit testing and SCA output etc.)
and is rebuilt periodically on a regular basis. The site structure is divided between
project information (e.g., infrastructure, mailing lists, repositories etc.) and reports
(e.g., unit testing, SCAs etc.)
-
- The development of OLAT itself started in 1999 at the University of Zürich, Switzerland,
- where it is the strategic learning management system. For further information see our main project website.
</description>
<organization>
- <name>Online Learning And Training (University of Zürich)</name>
- <url>http://www.olat.org/</url>
+ <name>OpenOLAT</name>
+ <url>http://www.openolat.org/</url>
</organization>
<licenses>
<license>
@@ -28,96 +25,20 @@
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>manual</distribution>
<comments>
- OLAT is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ OpenOLAT is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
</comments>
</license>
</licenses>
- <developers>
- <developer>
- <id>amoran</id>
- <name>Alan Moran</name>
- <email>alan.moran@id.uzh.ch</email>
- <roles>
- <role>Head of Development</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>pbrunner</id>
- <name>Patrick Brunner</name>
- <email>patrick.brunner@id.uzh.ch</email>
- <roles>
- <role>Quality Assurance Manager</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>asch</id>
- <name>Alexander Schneider</name>
- <email>alexander.schneider@id.uzh.ch</email>
- <roles>
- <role>Database Administrator</role>
- <role>Deployment Manager</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>matthai</id>
- <name>Matthai Karumacheril</name>
- <email>matthai.karumacheril@id.uzh.ch</email>
- <roles>
- <role>Developer</role>
- <role>Systems Analyst</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>lavinia</id>
- <name>Lavinia Dumitrescu</name>
- <email>lavinia.dumitrescu@id.uzh.ch</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>guretzki</id>
- <name>Christian Guretzki</name>
- <email>christian.guretzki@id.uzh.ch</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>mila</id>
- <name>Milanka Ringwald</name>
- <email>milanka.ringwald@id.uzh.ch</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>schnider</id>
- <name>Guido Schnider</name>
- <email>guido.schnider@id.uzh.ch</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
<distributionManagement>
<repository>
<id>releases</id>
- <name>OLAT Internal Nexus Release Repository</name>
- <url>http://repo.olat.uzh.ch/nexus/content/repositories/releases</url>
+ <name>OpenOLAT Internal Nexus Release Repository</name>
+ <url>http://nexus.openolat.org/nexus/content/repositories/releases</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
- <name>OLAT Internal Nexus Snapshot Repository</name>
- <url>http://repo.olat.uzh.ch/nexus/content/repositories/snapshots</url>
+ <name>OpenOLAT Internal Nexus Snapshot Repository</name>
+ <url>http://nexus.openolat.uzh.ch/nexus/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<issueManagement>
@@ -131,39 +52,10 @@
</scm>
<mailingLists>
<mailingList>
- <name>olat-announce</name>
- <subscribe>https://lists.uzh.ch/lists.olat.org/sympa/subscribe/olat-announce</subscribe>
- <unsubscribe>https://lists.uzh.ch/lists.olat.org/sympa/sigrequest/olat-announce</unsubscribe>
- <post>olat-announce@lists.olat.org</post>
- <archive>https://lists.uzh.ch/lists.olat.org/sympa/info/olat-announce</archive>
- </mailingList>
- <mailingList>
- <name>olat-users</name>
- <subscribe>https://lists.uzh.ch/lists.olat.org/sympa/subscribe/olat-users</subscribe>
- <unsubscribe>https://lists.uzh.ch/lists.olat.org/sympa/sigrequest/olat-users</unsubscribe>
- <post>olat-users@lists.olat.org</post>
- <archive>https://lists.uzh.ch/lists.olat.org/sympa/info/olat-users</archive>
- </mailingList>
- <mailingList>
- <name>olat-developers</name>
- <subscribe>https://lists.uzh.ch/lists.olat.org/sympa/subscribe/olat-developers</subscribe>
- <unsubscribe>https://lists.uzh.ch/lists.olat.org/sympa/sigrequest/olat-developers</unsubscribe>
- <post>olat-developers@lists.olat.org</post>
- <archive>https://lists.uzh.ch/lists.olat.org/sympa/info/olat-developers</archive>
- </mailingList>
- <mailingList>
- <name>olat-translators</name>
- <subscribe>https://lists.uzh.ch/lists.olat.org/sympa/subscribe/olat-translators</subscribe>
- <unsubscribe>https://lists.uzh.ch/lists.olat.org/sympa/sigrequest/olat-translators</unsubscribe>
- <post>olat-translators@lists.olat.org</post>
- <archive>https://lists.uzh.ch/lists.olat.org/sympa/info/olat-translators</archive>
- </mailingList>
- <mailingList>
- <name>olat-usability</name>
- <subscribe>https://lists.uzh.ch/lists.olat.org/sympa/subscribe/olat-usability</subscribe>
- <unsubscribe>https://lists.uzh.ch/lists.olat.org/sympa/sigrequest/olat-usability</unsubscribe>
- <post>olat-usability@lists.olat.org</post>
- <archive>https://lists.uzh.ch/lists.olat.org/sympa/info/olat-usability</archive>
+ <name>openolat</name>
+ <subscribe>https://groups.google.com/forum/#!forum/openolat</subscribe>
+ <post>openolat@googlegroups.com</post>
+ <archive>https://groups.google.com/forum/#!forum/openolat</archive>
</mailingList>
</mailingLists>
<!-- Unless otherwise explicitly stated the character encoding for all resources
@@ -791,7 +683,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.olat.testutils</groupId>
+ <groupId>org.openolat.testutils</groupId>
<artifactId>zipped-tomcat6x</artifactId>
<version>1.0</version>
<type>zip</type>
@@ -812,7 +704,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.olat.testutils</groupId>
+ <groupId>org.openolat.testutils</groupId>
<artifactId>zipped-tomcat6x</artifactId>
<version>1.0</version>
<type>zip</type>
@@ -1366,36 +1258,25 @@
</profiles>
<repositories>
<repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>repo.olat.org</id>
- <name>OLAT Maven Repository</name>
- <url>http://repo.olat.org/nexus/content/groups/public</url>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>maven2-repository.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
</repository>
<repository>
<id>nexus.codehaus.org</id>
<name>Codehaus nexus repo</name>
<url>https://nexus.codehaus.org/content/groups/public</url>
</repository>
- <repository>
- <id>repo.olat.org1</id>
- <name>OLAT Maven Repository1</name>
- <url>http://repo.olat.org/nexus/content/repositories/dependencies</url>
- </repository>
- <repository>
- <id>repo.olat.org2</id>
- <name>OLAT Maven Repository2</name>
- <url>http://repo.olat.org/nexus/content/repositories/releases</url>
- </repository>
- <repository>
- <id>olat-plugin-repo</id>
- <url>http://repo.olat.org/nexus</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- </repository>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
@@ -1410,32 +1291,31 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>java-net-plugin-repo</id>
- <name>Java net Maven plugin repository</name>
- <url>http://download.java.net/maven/2</url>
+ <repository>
+ <id>openolat-repo</id>
+ <name>OpenOLAT Public Maven Repository Group</name>
+ <url>http://nexus.openolat.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
<releases>
<enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
- </pluginRepository>
+ </repository>
+ </repositories>
+ <pluginRepositories>
<pluginRepository>
- <id>olat-plugin-repo</id>
- <name>OLAT Maven plugin repository</name>
- <url>http://repo.olat.org/nexus</url>
+ <id>java-net-plugin-repo</id>
+ <name>Java net Maven plugin repository</name>
+ <url>http://download.java.net/maven/2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
- <!-- The frequency for downloading updates - can be "always", "daily"
- (default), "interval:XXX" (in minutes) or "never" (only if it doesn't exist
- locally). -->
<updatePolicy>daily</updatePolicy>
</snapshots>
</pluginRepository>
@@ -1547,38 +1427,16 @@
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
- <!-- <configuration> <webXml>target/web.xml</webXml> </configuration> -->
<configuration>
<attachClasses>true</attachClasses>
<directory>src/main/java</directory>
- <!-- <webResources> -->
- <!-- <resource> -->
- <!-- <directory>src/main/java</directory> -->
- <!-- <targetPath>WEB-INF/classes</targetPath> -->
- <!-- <excludes> -->
- <!-- <exclude>**/*.java</exclude> -->
- <!-- </excludes> -->
- <!-- </resource> -->
- <!-- <resource> -->
- <!-- <directory>src/main/resources</directory> -->
- <!-- <excludes> -->
- <!-- <exclude>**/log4j.xml</exclude> -->
- <!-- </excludes> -->
- <!-- </resource> -->
- <!-- </webResources> -->
</configuration>
</plugin>
-
-
-
-
-
<!-- The Eclipse plugin is only of interest to developers and requires
that WTP be installed. -->
<plugin>
@@ -1848,9 +1706,9 @@
<!-- check with mvn dependency:tree to see what other dep. get downloaded -->
<dependencies>
<dependency>
- <groupId>org.olat.testutils</groupId>
- <artifactId>olat-codepoints-full</artifactId>
- <version>olat-codepoints-full.jar</version>
+ <groupId>org.openolat.testutils</groupId>
+ <artifactId>codepoints-full</artifactId>
+ <version>1.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -2284,17 +2142,10 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>codepoints</groupId>
+ <groupId>org.openolat.testutils</groupId>
<artifactId>codepoints</artifactId>
<version>1.0.3</version>
</dependency>
-
- <dependency>
- <groupId>olat-extension-springtest</groupId>
- <artifactId>olat-extension-springtest</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -2430,9 +2281,9 @@
<version>3.0.2</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.0.0-rc8</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<!-- Spring dependencies -->
@@ -2525,6 +2376,7 @@
</exclusions>
</dependency>
+ <!--
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
@@ -2562,6 +2414,7 @@
<artifactId>jersey-multipart</artifactId>
<version>1.1.5.1</version>
</dependency>
+ -->
<dependency>
<groupId>com.sun.jersey</groupId>
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index 7a3c86e0fd5..447e59c55f4 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -134,7 +134,6 @@ import org.junit.runners.Suite;
org.olat.modules.webFeed.FeedManagerTestWithMocking.class,
org.olat.instantMessaging.IMUnitTestWithoutOLAT.class,
org.olat.course.TestDeployableRepositoryExport.class,
- org.olat.test.SpringTest.class,//ok
org.olat.upgrade.UpgradeDefinitionTest.class,
org.olat.modules.fo.WordCountTest.class
diff --git a/src/test/java/org/olat/test/SpringTest.java b/src/test/java/org/olat/test/SpringTest.java
deleted file mode 100644
index 4006d4f80f7..00000000000
--- a/src/test/java/org/olat/test/SpringTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * OLAT - Online Learning and Training<br>
- * http://www.olat.org
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS,
- * <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Copyright (c) 2007 frentix GmbH, Switzerland<br>
- * <p>
- */
-package org.olat.test;
-
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-import com.frentix.spring.test.HelloWorld;
-
-/**
- * <h3>Description:</h3>
- * Test if the spring loading mechanism works
- * <p>
- * Initial Date: 04.05.2007 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-@ContextConfiguration(locations = {"classpath*:/serviceconfig/com/frentix/spring/test/_spring/olatextconfig.xml"})
-public class SpringTest extends AbstractJUnit4SpringContextTests {
-
- @Autowired
- HelloWorld helloWorld;
-
- @Test
- public void testClassAvailable() {
- try {
- com.frentix.spring.test.HelloWorld.class.getName();
- assertTrue(true);
- } catch (Exception e) {
- fail("Could not find HelloWorld class - jar not loaded");
- }
- }
-
- @Test
- public void testSpringLoadClass() {
- try {
- assertTrue(helloWorld.toString().equals("Hello World"));
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- @Test
- public void testSpringLoadConfigManuallyAsClasspathResource() {
- try {
- Resource resource = new ClassPathResource("/serviceconfig/com/frentix/spring/test/_spring/olatextconfig.xml");
- assertTrue(resource != null && resource.exists());
- // -> config is here, so loading mechanism in CoreSpringFactory must be broken if tests above fail
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- @Test
- public void testSpringLoadSingleResource() {
- try {
- Resource resource = applicationContext.getResource("/com/frentix/spring/test/testresource.png");
- assertTrue(resource != null && resource.exists());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- @Test
- public void testSpringLoadMultipleResourcesWithWildcard() {
- try {
- Resource[] resources = applicationContext.getResources("/com/frentix/spring/test/*.png");
- assertTrue(resources != null && resources.length == 2);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
-
-}
--
GitLab