cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1570999 - in /cxf/fediz/trunk/services/idp: pom.xml src/main/resources/persistence.properties src/test/resources/persistence.properties
Date Sun, 23 Feb 2014 12:13:13 GMT
Author: owulff
Date: Sun Feb 23 12:13:13 2014
New Revision: 1570999

URL: http://svn.apache.org/r1570999
Log:
[FEDIZ-69] Support starting IDP with jetty maven plugin

Modified:
    cxf/fediz/trunk/services/idp/pom.xml
    cxf/fediz/trunk/services/idp/src/main/resources/persistence.properties
    cxf/fediz/trunk/services/idp/src/test/resources/persistence.properties

Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1570999&r1=1570998&r2=1570999&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Sun Feb 23 12:13:13 2014
@@ -50,8 +50,7 @@
     </dependencyManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <idp.https.port>9443</idp.https.port>
-        <idp.http.port>9080</idp.http.port>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
     <dependencies>
         <dependency>
@@ -79,7 +78,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -198,6 +196,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/realm.properties</include>
+                    <include>**/persistence.properties</include>
                     <include>**/web.xml</include>
                 </includes>
             </resource>
@@ -206,6 +205,7 @@
                 <filtering>false</filtering>
                 <excludes>
                     <exclude>**/realm.properties</exclude>
+                    <exclude>**/persistence.properties</exclude>
                     <exclude>**/web.xml</exclude>
                 </excludes>
             </resource>
@@ -285,6 +285,8 @@
                         <configuration>
                             <portNames>
                                 <portName>idp.https.port</portName>
+                                <portName>idp.http.port</portName>
+                                <portName>idp.stop.port</portName>
                             </portNames>
                         </configuration>
                     </execution>
@@ -315,7 +317,7 @@
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty.version}</version>
                 <configuration>
-                    <stopPort>8005</stopPort>
+                    <stopPort>${idp.stop.port}</stopPort>
                     <stopKey>STOP</stopKey>
                     <connectors>
                         <connector
@@ -335,15 +337,15 @@
                     <contextHandlers>
                         <contextHandler
                             implementation="org.eclipse.jetty.webapp.WebAppContext">
-                            <war>${basedir}/target/fediz-idp.war</war>
-                            <contextPath>/fediz-idp</contextPath>
-                        </contextHandler>
-                        <contextHandler
-                            implementation="org.eclipse.jetty.webapp.WebAppContext">
                             <war>${basedir}/target/fediz-idp-sts.war</war>
                             <contextPath>/fediz-idp-sts</contextPath>
                             <throwUnavailableOnStartupException>false</throwUnavailableOnStartupException>
                         </contextHandler>
+                        <contextHandler
+                            implementation="org.eclipse.jetty.webapp.WebAppContext">
+                            <war>${basedir}/target/fediz-idp.war</war>
+                            <contextPath>/fediz-idp</contextPath>
+                        </contextHandler>
                     </contextHandlers>
                 </configuration>
                 <executions>
@@ -421,40 +423,89 @@
 
     <profiles>
         <profile>
-            <id>realm-a</id>
+            <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
+                <jpa.url>jdbc:hsqldb:target/db/realma/myDB;shutdown=true</jpa.url>
+            </properties>
+            <build>
+                <filters>
+                    <filter>src/main/filters/realm-a/env.properties</filter>
+                </filters>
+            </build>
+        </profile>
+        <profile>
+            <id>realm-a</id>
+            <properties>
+                <jpa.url>jdbc:hsqldb:target/db/realma/myDB;shutdown=true</jpa.url>
+                <idp.https.port>9443</idp.https.port>
+                <idp.http.port>9080</idp.http.port>
             </properties>
             <build>
                 <filters>
                     <filter>src/main/filters/realm-a/env.properties</filter>
                 </filters>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <configuration>
+                            <contextHandlers>
+                                <contextHandler
+                                    implementation="org.eclipse.jetty.webapp.WebAppContext">
+                                    <war>${basedir}/target/fediz-idp.war</war>
+                                    <contextPath>/fediz-idp</contextPath>
+                                </contextHandler>
+                            </contextHandlers>
+                         </configuration>
+                     </plugin>
+                 </plugins>
             </build>
         </profile>
         <profile>
             <id>realm-b</id>
             <properties>
+                <jpa.url>jdbc:hsqldb:target/db/realmb/myDB;shutdown=true</jpa.url>
+                <idp.https.port>12443</idp.https.port>
+                <idp.http.port>12080</idp.http.port>
             </properties>
             <build>
                 <filters>
                     <filter>src/main/filters/realm-b/env.properties</filter>
                 </filters>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <configuration>
+                            <contextHandlers>
+                                <contextHandler
+                                    implementation="org.eclipse.jetty.webapp.WebAppContext">
+                                    <war>${basedir}/target/fediz-idp-remote.war</war>
+                                    <contextPath>/fediz-idp-remote</contextPath>
+                                </contextHandler>
+                            </contextHandlers>
+                         </configuration>
+                     </plugin>
+                 </plugins>
                 <finalName>fediz-idp-remote</finalName>
             </build>
         </profile>
         <profile>
+            <id>standalone</id>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+            <build>
+                <defaultGoal>jetty:run-war</defaultGoal>
+            </build>
+        </profile>
+
+        <profile>
             <id>sts</id>
             <build>
-                <!-- If you choose this profile -Psts then the profile 'realm-a' 
-                    is not active -->
-                <!-- activeByDefault means the profile is active if no other 
-                    profile has been chosen -->
-                <!-- Therefore, filter definition copied from profile 'realm-a' -->
-                <filters>
-                    <filter>src/main/filters/realm-a/env.properties</filter>
-                </filters>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -485,7 +536,20 @@
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <configuration>
+                            <contextHandlers combine.children="append">
+                                <contextHandler
+                                    implementation="org.eclipse.jetty.webapp.WebAppContext">
+                                    <war>${basedir}/target/fediz-idp-sts.war</war>
+                                    <contextPath>/fediz-idp-sts</contextPath>
+                                </contextHandler>
+                            </contextHandlers>
+                         </configuration>
+                     </plugin>
+                 </plugins>
             </build>
         </profile>
     </profiles>

Modified: cxf/fediz/trunk/services/idp/src/main/resources/persistence.properties
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/persistence.properties?rev=1570999&r1=1570998&r2=1570999&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/persistence.properties (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/persistence.properties Sun Feb 23 12:13:13
2014
@@ -7,7 +7,8 @@
 
 
 jpa.driverClassName=org.hsqldb.jdbcDriver
-jpa.url=jdbc:hsqldb:target/fediz/db/myDB;shutdown=true
+#jpa.url=jdbc:hsqldb:target/fediz/db/myDB;shutdown=true
+jpa.url=${jpa.url}
 jpa.username=sa
 jpa.password=
 jpa.defaultData=true

Modified: cxf/fediz/trunk/services/idp/src/test/resources/persistence.properties
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/persistence.properties?rev=1570999&r1=1570998&r2=1570999&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/resources/persistence.properties (original)
+++ cxf/fediz/trunk/services/idp/src/test/resources/persistence.properties Sun Feb 23 12:13:13
2014
@@ -7,8 +7,8 @@
 
 
 jpa.driverClassName=org.hsqldb.jdbcDriver
-jpa.url=jdbc:hsqldb:target/unit/fediz/db/myDB;shutdown=true
+jpa.url=jdbc:hsqldb:target/db/unit/myDB;shutdown=true
 jpa.username=sa
 jpa.password=
 jpa.defaultData=true
-jpa.platform=HSQLDictionary
\ No newline at end of file
+jpa.platform=HSQLDictionary



Mime
View raw message