Skip to content
Snippets Groups Projects
Commit 7dfc3038 authored by srosse's avatar srosse
Browse files

OO-1005: update hibernate, xstream... Remove support for glassfish. Exclude... 

OO-1005: update hibernate, xstream... Remove support for glassfish. Exclude documentation resources of the final WAR file
parent 0c03c790
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
INSTALL.APPSERVER.README
+ 4
− 36
View file @ 7dfc3038
......@@ -3,7 +3,7 @@ EXPERIMENTAL: Setting up latest OpenOLAT version on Eclipse With an Application
--------------------------------------------------------------------------------------
OpenOLAT supports only Tomcat officially, but it can also run on other application
servers like JBoss AS or Glassfish. This README is intended for people who have
servers like JBoss AS / Wildfly. This README is intended for people who have
some minimal experience with these servers and can install a JDBC driver, set some
JMS resources...
......@@ -12,9 +12,6 @@ To create your eclipse project, use these commands instead of the default one:
for JBoss AS:
mvn eclipse:clean eclipse:eclipse -P-tomcat,jbossas7
and for Glassfish
mvn eclipse:clean eclipse:eclipse -P-tomcat,gae
Configuration JBoss AS 7.1
......@@ -63,33 +60,6 @@ Configuration WildFly (JBoss AS 8.0)
exam.broker.jndi=java:jboss/exported/jms/queue/examQueue
Configuration Glassfish 3.1
---------------------------
1. I use the community edition of Glassfish version 3.1.2.2.
2. In the administration console, create a JDBC Resource with a JNDI name like:
jdbc/OpenOLATDS
and drop the driver.jar at the right place.
In olat.local.properties, set the following properties:
db.source=jndi
db.jndi=jdbc/OpenOLATDS
3. In the administration console, create in JMS Resources > Connection factories:
-A resource of type javax.jms.ConnectionFactory with a JNDI name like:
OpenOLATConnectionFactory
In JMS Resources > Destination factories:
-A queue of type javax.jms.Queue and a JNDI name like;
queue/searchQueue
-A topic of type javax.jms.Topic and a JNDI name like;
topic/sysbus
in olat.local.properties set the following properties:
jms.provider=jndi
jms.broker.jndi=OpenOLATConnectionFactory
sysbus.broker.jndi=topic/sysbus
search.broker.jndi=queue/searchQueue
index.broker.jndi=queue/indexQueue
exam.broker.jndi=queue/examQueue
Features located on the application server
------------------------------------------
State Feature
......@@ -97,10 +67,8 @@ State Feature
OK JDBC Connections
OK JMS
OK JAX-RS (restapi)
x JAX-WS (onyx, vitero)
OK JAX-WS (onyx, vitero)
x Mail
x LDAP Connection
OK (only JBoss) Hibernate/JPA (only JBoss AS, we depend on Hibernate)
x Caching (for JPA second level cache for example)
OK Hibernate/JPA (only JBoss AS, we depend on Hibernate)
OK Caching (for JPA second level cache for example)
pom.xml
+ 44
− 145
View file @ 7dfc3038
......@@ -64,13 +64,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.7</targetJdk>
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
<org.hibernate.version>4.2.8.Final</org.hibernate.version>
<org.springframework.version>3.2.8.RELEASE</org.springframework.version>
<org.hibernate.version>4.2.9.Final</org.hibernate.version>
<com.sun.jersey.version>1.17.1</com.sun.jersey.version>
<jackson.version>1.9.2</jackson.version>
<org.mysql.version>5.1.26</org.mysql.version>
<org.mysql.version>5.1.29</org.mysql.version>
<org.postgresql.version>9.1-901.jdbc4</org.postgresql.version>
<org.infinispan.version>5.2.7.Final</org.infinispan.version>
<lucene.version>4.5.1</lucene.version>
<!-- properties for testing and Q&A -->
<!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->
......@@ -415,10 +416,6 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/webapp-tomcat</directory>
<filtering>false</filtering>
......@@ -433,6 +430,12 @@
<profile>
<id>jbossas7</id>
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
......@@ -543,120 +546,6 @@
<directory>src/main/webapp-jbossas7</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
</resource>
</webResources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>gae</id>
<dependencies>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${org.hibernate.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${org.hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-infinispan</artifactId>
<version>${org.hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${org.hibernate.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${org.mysql.version}</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${org.postgresql.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>5.3.2</version>
<exclusions>
<exclusion>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
<!-- fxdiff: FXOLAT-243 clean up the dependencies of ActiveMQ -->
<exclusion>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/webapp-gae</directory>
<filtering>false</filtering>
</resource>
</webResources>
</configuration>
</plugin>
......@@ -1286,6 +1175,10 @@
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.vsd</exclude>
<exclude>**/*.odg</exclude>
<exclude>**/*.odt</exclude>
<exclude>**/*.pdf</exclude>
</excludes>
</resource>
<resource>
......@@ -1298,21 +1191,20 @@
</excludes>
</resource>
</resources>
<testResources>
<!-- Same comment as for src/main/java also applies to src/test/java -->
<testResource>
<directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<directory>src/test/resources</directory>
<!-- when enabled resources will be searched and variables replaces with
values -->
<filtering>true</filtering>
</testResource>
</testResources>
<testResources>
<!-- Same comment as for src/main/java also applies to src/test/java -->
<testResource>
<directory>src/test/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<directory>src/test/resources</directory>
<!-- when enabled resources will be searched and variables replaces with values -->
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.openolat.mojo</groupId>
......@@ -1350,7 +1242,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<version>2.4</version>
<configuration>
<attachClasses>true</attachClasses>
<directory>src/main/java</directory>
......@@ -1365,6 +1257,13 @@
<Implementation-Build>${buildNumber}</Implementation-Build>
</manifestEntries>
</archive>
<excludes>**/*.pxm, **/*.psd, **/*.scss, **/*.sh, **/*.README</excludes>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
</resource>
</webResources>
</configuration>
</plugin>
......@@ -2075,7 +1974,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.5</version>
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>cos</groupId>
......@@ -2122,27 +2021,27 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>4.5.1</version>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
<version>4.5.1</version>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>4.5.1</version>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>4.5.1</version>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-suggest</artifactId>
<version>4.5.1</version>
<version>${lucene.version}</version>
</dependency>
<!-- End lucene dependencies -->
......@@ -2265,13 +2164,13 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>1.0.0.Beta30</version>
<version>1.0.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>1.0.0.Beta30</version>
<version>1.0.0.Final</version>
<scope>test</scope>
</dependency>
......
src/test/java/org/olat/core/commons/services/webdav/WebDAVTestCase.java
+ 1
− 1
View file @ 7dfc3038
......@@ -78,7 +78,7 @@ public abstract class WebDAVTestCase extends OlatTestCase {
manager.deploy();
webServer = Undertow.builder()
.addListener(PORT, HOST)
.addHttpListener(PORT, HOST)
.setHandler(manager.start())
.build();
webServer.start();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment