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

OO-280: cleanup pom.xml, remove unused profils, remove profiles for selenium... 

OO-280: cleanup pom.xml, remove unused profils, remove profiles for selenium 1, remove unused plugins
parent 0fd450a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 39
− 274
View file @ dc8837ac
...@@ -66,86 +66,25 @@ ...@@ -66,86 +66,25 @@
<targetJdk>1.6</targetJdk> <targetJdk>1.6</targetJdk>
<org.springframework.version>3.1.1.RELEASE</org.springframework.version> <org.springframework.version>3.1.1.RELEASE</org.springframework.version>
<!-- properties for testing and Q&A --> <!-- 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 --> <!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->
<skipTests>true</skipTests> <skipTests>true</skipTests>
<skipITs>true</skipITs> <skipITs>true</skipITs>
<!-- properties to define the testing environment --> <!-- properties to define the testing environment -->
<test.env>mysql</test.env> <test.env>mysql</test.env>
<!-- olat.local.properties to distinguish multiple single and cluster olat instances on a single machine--> <!-- olat.local.properties to distinguish multiple single and cluster olat instances on a single machine-->
<test.env.db.name>olattest</test.env.db.name> <test.env.db.name>olattest</test.env.db.name>
<test.env.db.user>olat</test.env.db.user> <test.env.db.user>olat</test.env.db.user>
<test.env.db.pass>olat</test.env.db.pass> <test.env.db.pass>olat</test.env.db.pass>
<test.env.db.host.port>3306</test.env.db.host.port> <test.env.db.host.port>3306</test.env.db.host.port>
<test.env.db.postgresql.user>postgres</test.env.db.postgresql.user> <test.env.db.postgresql.user>postgres</test.env.db.postgresql.user>
<test.env.db.postgresql.pass>postgres</test.env.db.postgresql.pass> <test.env.db.postgresql.pass>postgres</test.env.db.postgresql.pass>
<test.env.db.postgresql.host.port>5432</test.env.db.postgresql.host.port> <test.env.db.postgresql.host.port>5432</test.env.db.postgresql.host.port>
<test.env.db.hibernate.ddl.auto>create</test.env.db.hibernate.ddl.auto> <test.env.db.hibernate.ddl.auto>create</test.env.db.hibernate.ddl.auto>
<test.env.instance.id>myolat</test.env.instance.id> <test.env.instance.id>myolat</test.env.instance.id>
<test.env.jms.broker.port>61616</test.env.jms.broker.port>
<test.env.jmx.rmi.port.0>3000</test.env.jmx.rmi.port.0>
<test.env.jmx.rmi.port.1>3001</test.env.jmx.rmi.port.1>
<test.env.jmx.rmi.port.2>3002</test.env.jmx.rmi.port.2>
<!-- this version is defined by the dependency <groupId>org.olat.testutils</groupId> <artifactId>zipped-tomcat6x</artifactId> and the herein zipped tomcat installation -->
<container.tomcat.version>6.0.32</container.tomcat.version>
<!-- install dir is important for the -Pinstall-tomcats profile.
These few lines define the default tomcat installation variables for installation and running a local tomcat cluster.
If you want to reuse an existing tomcat installation, set the container.tomcat.*.home instead. -->
<container.tomcat.one.install.dir>${basedir}/cargo/tomcat/one/</container.tomcat.one.install.dir>
<container.tomcat.one.home>${container.tomcat.one.install.dir}/apache-tomcat-${container.tomcat.version}</container.tomcat.one.home>
<!-- The port.part is used in several places to create cluster which follows the template:
servlet port 8181
administration ports 8109, 8105
go to the src/test/profile/cluster/tomcat*/conf and lib/ to see the actual replacements.-->
<container.tomcat.one.port.part>81</container.tomcat.one.port.part>
<container.tomcat.one.port>${container.tomcat.one.port.part}${container.tomcat.one.port.part}</container.tomcat.one.port>
<container.tomcat.two.install.dir>${basedir}/cargo/tomcat/two/</container.tomcat.two.install.dir>
<container.tomcat.two.home>${container.tomcat.two.install.dir}/apache-tomcat-${container.tomcat.version}</container.tomcat.two.home>
<container.tomcat.two.port.part>82</container.tomcat.two.port.part>
<container.tomcat.two.port>${container.tomcat.two.port.part}${container.tomcat.two.port.part}</container.tomcat.two.port>
<!-- the selenium client version which is also by the maven-selenium-plugin,
using the latest selenium a.k.a selenium 2.0 needs a migration of the tests and maven setup. -->
<selenium-client.version>1.0.2</selenium-client.version>
<!-- the selenium configuration needed to configure the tomcats, selenium context and maven failsafe (testng) runner.
The tomcat knows which user to add just for selenium testcases, see additionalUserContext.xml
The selenium context is defined in the defaultcontext.xml and has variable replacements as specified above.
The failsafe plugin uses the testng.xml file which comes from this folder.
In order to customize the selenium tests execution follow the steps:
1) copy the test/profile/selenium/config folder to a save place
2) edit the contents of the files (i.e. change executed seleniumtests, add firefox browser executable path to defaultcontext.xml etc.)
3) run maven among other parameters with -Dselenium.config.files.path="<your-path-without-special-chars>" -->
<selenium.config.files.path>src/test/profile/selenium/config</selenium.config.files.path>
<!-- proposal for setting the firefox executable path, which could be used as variable in the defaultcontext.xml
important if using a firefox script which does not allow to kill the firefoxes after usage. (e.g. Suse 64Bit)-->
<selenium.config.firefox.path>unused/by/default</selenium.config.firefox.path>
<!-- properties for debugging -->
<!-- for debugging reason it may be helpful to set this with
-Dcargo.container.wait=true to see if the container is up and running for the seleniumtests. -->
<cargo.container.wait>false</cargo.container.wait>
<cargo.container.timeout>300000</cargo.container.timeout>
</properties> </properties>
<profiles> <profiles>
<profile>
<!-- this serves as an example of how to run something whenever the os familiy matches unix (includes linux as well) -->
<id>linux</id>
<activation><os><family>unix</family></os></activation>
<properties>
<os.property.file>linux.properties</os.property.file>
</properties>
</profile>
<profile>
<!-- this serves as an example of how to run something whenever the os familiy matches unix (includes linux as well) -->
<id>windows</id>
<activation><os><family>windows</family></os></activation>
<properties>
<os.property.file>win.properties</os.property.file>
</properties>
</profile>
<profile> <profile>
<id>documentation</id> <id>documentation</id>
<build> <build>
...@@ -350,25 +289,6 @@ ...@@ -350,25 +289,6 @@
</srcFiles> </srcFiles>
</configuration> </configuration>
</execution> </execution>
<!--
<execution>
<id>create-data</id>
<phase>process-test-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<orderFile>ascending</orderFile>
<fileset>
<basedir>${basedir}</basedir>
<includes>
<include>src/test/sql/test-data2.sql</include>
<include>src/test/sql/test-data1.sql</include>
</includes>
</fileset>
</configuration>
</execution>
-->
<!-- drop db after test --> <!-- drop db after test -->
<execution> <execution>
<id>drop-db-after-test</id> <id>drop-db-after-test</id>
...@@ -386,9 +306,6 @@ ...@@ -386,9 +306,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
...@@ -593,85 +510,17 @@ ...@@ -593,85 +510,17 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<!-- activate this profile to unzip two tomcats instances for cluster setup, which are the configured and used with profile seleniumtests
bind to phase initialize and execute goal unpack
... initialize is an early phase, so that unpacking does not overwrite resources copied over to the tomcats. -->
<id>install-tomcats</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<id>install-tomcat-one</id>
<phase>validate</phase>
<goals>
<goal>unpack
</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.openolat.testutils</groupId>
<artifactId>zipped-tomcat6x</artifactId>
<version>1.0</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${container.tomcat.one.install.dir}</outputDirectory>
</artifactItem>
</artifactItems>
<!-- other configurations here -->
</configuration>
</execution>
<execution>
<id>install-tomcat-two</id>
<!-- bind to initialize, that tomcats are unpacked before resources are copied over -->
<phase>validate</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.openolat.testutils</groupId>
<artifactId>zipped-tomcat6x</artifactId>
<version>1.0</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${container.tomcat.two.install.dir}</outputDirectory>
</artifactItem>
</artifactItems>
<!-- other configurations here -->
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile> <!-- Retain the dependency for cluster -->
<id>debug</id> <profile>
<properties> <id>cluster</id>
<skipTests>true</skipTests> <activation>
<skipITs>true</skipITs> <property>
<cargo.container.wait>true</cargo.container.wait> <name>cluster</name>
</properties> </property>
</profile> </activation>
<dependencies>
<profile> <dependency>
<id>cluster</id>
<activation>
<property>
<name>cluster</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss</groupId> <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId> <artifactId>jboss-common-core</artifactId>
<version>2.2.8.GA</version> <version>2.2.8.GA</version>
...@@ -692,8 +541,8 @@ ...@@ -692,8 +541,8 @@
<version>3.3.2.GA</version> <version>3.3.2.GA</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>arquillian</id> <id>arquillian</id>
...@@ -738,14 +587,6 @@ ...@@ -738,14 +587,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-managed-7</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile> </profile>
</profiles> </profiles>
<repositories> <repositories>
...@@ -780,7 +621,7 @@ ...@@ -780,7 +621,7 @@
</releases> </releases>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<updatePolicy>never</updatePolicy> <updatePolicy>daily</updatePolicy>
</snapshots> </snapshots>
</repository> </repository>
<repository> <repository>
...@@ -840,13 +681,6 @@ ...@@ -840,13 +681,6 @@
values --> values -->
<filtering>false</filtering> <filtering>false</filtering>
</resource> </resource>
<!-- TODO: RH: include static to react on changes during devel, target not working!
<resource>
<directory>src/main/webapp/static</directory>
<targetPath>${project.build.directory}/static</targetPath>
<filtering>false</filtering>
</resource>
-->
</resources> </resources>
<testResources> <testResources>
<!-- Same comment as for src/main/java also applies to src/test/java --> <!-- Same comment as for src/main/java also applies to src/test/java -->
...@@ -864,41 +698,6 @@ ...@@ -864,41 +698,6 @@
</testResource> </testResource>
</testResources> </testResources>
<plugins> <plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<id>copy-resources</id>
<!-- hook in to generate and copy filtered resources when running eclipse:eclipse
as this plugin runs in the generete-resources phase -->
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<resources>
<resource>
<!-- place resources you like to get filtered an copied -->
<directory>src/main/templates</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/profile</directory>
<includes>
<include>${os.property.file}</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
...@@ -908,14 +707,10 @@ ...@@ -908,14 +707,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
<!-- These apparently harmless settings cause certain types of builds
to fail (typically with a failure to find the "javac" program ) - this appears
to be a Maven issue and is currently pending investigation <fork>true</fork>
<meminitial>512m</meminitial> <maxmem>1024m</maxmem> -->
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
...@@ -923,7 +718,7 @@ ...@@ -923,7 +718,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version> <version>2.2</version>
<configuration> <configuration>
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<directory>src/main/java</directory> <directory>src/main/java</directory>
...@@ -954,7 +749,7 @@ ...@@ -954,7 +749,7 @@
<wtpversion>2.0</wtpversion> <wtpversion>2.0</wtpversion>
<!-- context name for servlet container e.g. localhost:8080/olat --> <!-- context name for servlet container e.g. localhost:8080/olat -->
<wtpContextName>olat</wtpContextName> <wtpContextName>olat</wtpContextName>
<downloadSources>false</downloadSources> <downloadSources>true</downloadSources>
<additionalConfig> <additionalConfig>
<file> <file>
<name>.settings/org.eclipse.core.resources.prefs</name> <name>.settings/org.eclipse.core.resources.prefs</name>
...@@ -970,7 +765,7 @@ ...@@ -970,7 +765,7 @@
<!-- reporting i.e., the site goal requires a more recent plugin version --> <!-- reporting i.e., the site goal requires a more recent plugin version -->
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>2.2</version> <version>3.1</version>
</plugin> </plugin>
<plugin> <plugin>
...@@ -1003,18 +798,6 @@ ...@@ -1003,18 +798,6 @@
</executions> </executions>
</plugin> </plugin>
<!-- mvn org.mortbay.jetty:jetty-maven-plugin:run will start olat with jetty
NOTE: when you get an "to many files error you can increase it with: ulimit -n 4096"
You have to provide an empty olat.local.properties files in your classpath to run jetty!
-->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.10</version>
</plugin>
<!-- start rest api documentation: broken: mvn javadoc:javadoc --> <!-- start rest api documentation: broken: mvn javadoc:javadoc -->
<plugin> <plugin>
<groupId>com.sun.tools.jxc.maven2</groupId> <groupId>com.sun.tools.jxc.maven2</groupId>
...@@ -1819,30 +1602,6 @@ ...@@ -1819,30 +1602,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.1.5.1</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-test-framework</artifactId> <artifactId>jersey-test-framework</artifactId>
...@@ -1896,6 +1655,12 @@ ...@@ -1896,6 +1655,12 @@
<artifactId>arquillian-junit-container</artifactId> <artifactId>arquillian-junit-container</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-managed-7</artifactId>
<version>1.0.0.CR3</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.arquillian.extension</groupId> <groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-impl</artifactId> <artifactId>arquillian-drone-impl</artifactId>
......
src/test/java/org/olat/login/FunctionalLoginTest.java
+ 5
− 1
View file @ dc8837ac
...@@ -79,6 +79,10 @@ public class FunctionalLoginTest { ...@@ -79,6 +79,10 @@ public class FunctionalLoginTest {
//check if administrator appears in the footer //check if administrator appears in the footer
boolean loginAs = browser.isElementPresent("xpath=//div[@id='b_footer_user']//i[contains(text(), 'administrator')]"); boolean loginAs = browser.isElementPresent("xpath=//div[@id='b_footer_user']//i[contains(text(), 'administrator')]");
Assert.assertTrue("User should be logged in!", loginAs); if(!loginAs) {
boolean acknowledge = browser.isElementPresent("xpath=//input[@name='acknowledge_checkbox']");
Assert.assertTrue("Acknowledge first!", acknowledge);
browser.click("name=acknowledge_checkbox");
}
} }
} }
src/test/java/org/olat/test/ArquillianDeployments.java
+ 0
− 13
View file @ dc8837ac
...@@ -45,8 +45,6 @@ public class ArquillianDeployments { ...@@ -45,8 +45,6 @@ public class ArquillianDeployments {
public static WebArchive createDeployment(String name) { public static WebArchive createDeployment(String name) {
WebArchive archive = ShrinkWrap.create(WebArchive.class, name); WebArchive archive = ShrinkWrap.create(WebArchive.class, name);
addClasses(archive); addClasses(archive);
addLibraries(archive); addLibraries(archive);
...@@ -66,17 +64,6 @@ public class ArquillianDeployments { ...@@ -66,17 +64,6 @@ public class ArquillianDeployments {
return archive.addAsLibraries(libs); return archive.addAsLibraries(libs);
} }
/*
public static WebArchive addMavenDependencies(WebArchive archive) {
File[] jars = DependencyResolvers
.use(MavenDependencyResolver.class)
.loadEffectivePom("pom.xml")
.importAnyDependencies();
return archive.addAsLibraries(jars);
}
*/
public static WebArchive addClasses(WebArchive archive) { public static WebArchive addClasses(WebArchive archive) {
return archive return archive
.addPackages(true, new FilterUnusedPackage(), "org.olat", "de.bps", "de.tuchemnitz.wizard"); .addPackages(true, new FilterUnusedPackage(), "org.olat", "de.bps", "de.tuchemnitz.wizard");
......
src/test/profile/postgresql/olat.local.properties
+ 1
− 0
View file @ dc8837ac
...@@ -50,3 +50,4 @@ db.pass=${test.env.db.postgresql.pass} ...@@ -50,3 +50,4 @@ db.pass=${test.env.db.postgresql.pass}
db.host.port=${test.env.db.postgresql.host.port} db.host.port=${test.env.db.postgresql.host.port}
db.database.dialect=org.hibernate.dialect.PostgreSQLDialect db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto} db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto}
auto.upgrade.database=false
src/test/resources/arquillian.xml
+ 4
− 0
View file @ dc8837ac
...@@ -14,5 +14,9 @@ ...@@ -14,5 +14,9 @@
<property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property> <property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property>
</configuration> </configuration>
</container> </container>
<extension qualifier="selenium">
<property name="browser">*googlechrome</property>
</extension>
</arquillian> </arquillian>
\ No newline at end of file
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