Skip to content

Commit

Permalink
Merge pull request #12 from mmoayyed/embedded-jetty
Browse files Browse the repository at this point in the history 
Run admin-gui web pp with an embedded jetty
  • Loading branch information
@semancik
semancik committed Aug 30, 2016
2 parents a91040c + ca4e45d commit 37a7be9
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -4,6 +4,7 @@
.settings
.idea
*.iml
*.log
*.versionsBackup
target
rebel.xml
Expand Down
47 changes: 29 additions & 18 deletions build-system/pom.xml
View file
Expand Up @@ -1169,18 +1169,6 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -1229,11 +1217,18 @@
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -1253,11 +1248,27 @@
<version>2.4</version> <configuration> <configLocation>http:///svn/coding-rules/CheckStyle-rules.xml</configLocation>
<includeTestSourceDirectory>false</includeTestSourceDirectory> </configuration>
</plugin -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.0.1.v20091125</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.3.10.v20160621</version>
<configuration>
<systemProperties>
<systemProperty>
<name>org.eclipse.jetty.annotations.maxWait</name>
<value>240</value>
</systemProperty>
</systemProperties>
<webApp>
<contextPath>/midpoint</contextPath>
<!-- <overrideDescriptor>${basedir}/etc/jetty/web.xml</overrideDescriptor> -->
</webApp>
<webAppConfig>
<allowDuplicateFragmentNames>true</allowDuplicateFragmentNames>
</webAppConfig>
<jvmArgs>-Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n</jvmArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
24 changes: 12 additions & 12 deletions gui/admin-gui/pom.xml
View file
Expand Up @@ -784,22 +784,22 @@
<activeByDefault>true</activeByDefault>
</activation>

<dependencies>
<dependency>
<artifactId>jaxb-impl</artifactId>
<groupId>com.sun.xml.bind</groupId>
<scope>runtime</scope>
<dependencies>
<dependency>
<artifactId>jaxb-impl</artifactId>
<groupId>com.sun.xml.bind</groupId>
<scope>runtime</scope>
</dependency>
<dependency>
<artifactId>jaxb-api</artifactId>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>javax.xml.bind</groupId>
</dependency>
<dependency>
<artifactId>jaxb-core</artifactId>
<groupId>com.sun.xml.bind</groupId>
<scope>runtime</scope>
</dependency>
</dependencies>
<artifactId>jaxb-core</artifactId>
<groupId>com.sun.xml.bind</groupId>
<scope>runtime</scope>
</dependency>
</dependencies>

</profile>

Expand Down

0 comments on commit 37a7be9

Please sign in to comment.