You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/03/22 15:42:10 UTC
svn commit: r1303808 - in /incubator/syncope/trunk/core: pom.xml
src/main/webapp/WEB-INF/glassfish-web.xml
Author: ilgrosso
Date: Thu Mar 22 14:42:09 2012
New Revision: 1303808
URL: http://svn.apache.org/viewvc?rev=1303808&view=rev
Log:
[SYNCOPE-25] Updating to latest glassfish required a Derby instance to be up and running on port 1527: unfortunately cargo does not seem able to launch it (asadmin start-database is not supported), so I ended up by adding a dedicated maven-antrun-plugin configuration inside the glassfish-it profile
Modified:
incubator/syncope/trunk/core/pom.xml
incubator/syncope/trunk/core/src/main/webapp/WEB-INF/glassfish-web.xml
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1303808&r1=1303807&r2=1303808&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Thu Mar 22 14:42:09 2012
@@ -943,6 +943,10 @@ under the License.
<profile>
<id>glassfish-it</id>
+
+ <properties>
+ <derby.version>10.8.2.2</derby.version>
+ </properties>
<dependencies>
<dependency>
@@ -959,6 +963,19 @@ under the License.
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -975,6 +992,96 @@ under the License.
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>start-derby</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <java classname="org.apache.derby.drda.NetworkServerControl" dir="${project.build.directory}"
+ classpathref="maven.test.classpath" fork="true" spawn="true">
+ <arg line="start -noSecurityManager"/>
+ </java>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-derby</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <java classname="org.apache.derby.drda.NetworkServerControl"
+ classpathref="maven.test.classpath">
+ <arg line="shutdown -noSecurityManager"/>
+ </java>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>start-derby</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <classpathScope>test</classpathScope>
+ <arguments>
+ <argument>-classpath</argument>
+ <classpath>
+ <dependency>org.apache.derby:derby</dependency>
+ <dependency>org.apache.derby:derbynet</dependency>
+ </classpath>
+ <argument>org.apache.derby.drda.NetworkServerControl</argument>
+ <argument>start</argument>
+ <argument>-noSecurityManager</argument>
+ </arguments>
+ <workingDirectory>${project.build.directory}/target/derby</workingDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-derby</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <classpathScope>test</classpathScope>
+ <arguments>
+ <argument>-classpath</argument>
+ <classpath>
+ <dependency>org.apache.derby:derby</dependency>
+ <dependency>org.apache.derby:derbynet</dependency>
+ </classpath>
+ <argument>org.apache.derby.drda.NetworkServerControl</argument>
+ <argument>shutdown</argument>
+ <argument>-noSecurityManager</argument>
+ </arguments>
+ <workingDirectory>${project.build.directory}/target/derby</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>-->
+
+ <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<inherited>true</inherited>
@@ -982,7 +1089,7 @@ under the License.
<container>
<containerId>glassfish3x</containerId>
<zipUrlInstaller>
- <url>http://download.java.net/glassfish/3.1.1/release/glassfish-3.1.1.zip</url>
+ <url>http://download.java.net/glassfish/3.1.2/release/glassfish-3.1.2.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${java.io.tmpdir}</extractDir>
</zipUrlInstaller>
Modified: incubator/syncope/trunk/core/src/main/webapp/WEB-INF/glassfish-web.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/webapp/WEB-INF/glassfish-web.xml?rev=1303808&r1=1303807&r2=1303808&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/webapp/WEB-INF/glassfish-web.xml (original)
+++ incubator/syncope/trunk/core/src/main/webapp/WEB-INF/glassfish-web.xml Thu Mar 22 14:42:09 2012
@@ -22,10 +22,11 @@ under the License.
GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
<context-root>/syncope</context-root>
- <resource-ref>
+ <!-- Uncomment this when using JNDI DataSource -->
+ <!--<resource-ref>
<res-ref-name>jdbc/syncopeDataSource</res-ref-name>
<jndi-name>jdbc/syncopeDataSource</jndi-name>
- </resource-ref>
+ </resource-ref>-->
<class-loader delegate="false"/>
<jsp-config>
<property name="httpMethods" value="GET,POST,HEAD,PUT,DELETE"/>