You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2016/03/25 15:10:53 UTC
[17/50] isis git commit: ISIS-1333: removing self-host profile.
ISIS-1333: removing self-host profile.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/31168c44
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/31168c44
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/31168c44
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: 31168c4448a7e1fb79230961ef1b7c43f3e042d5
Parents: f899716
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Mar 20 10:09:07 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Mar 20 10:12:39 2016 +0000
----------------------------------------------------------------------
example/application/simpleapp/webapp/pom.xml | 96 +----------------------
1 file changed, 2 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/31168c44/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index a7f0880..0c9ce66 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -164,14 +164,6 @@
<artifactId>isis-core-security</artifactId>
</dependency>
- <!-- to run using WebServer (optional) -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webserver</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
@@ -224,28 +216,6 @@
<profiles>
<profile>
- <id>self-host</id>
- <build>
- <plugins>
- <!--
- mvn -P self-host antrun:run
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <tasks>
- <exec executable="java" failonerror="true">
- <arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
- </exec>
- </tasks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>intellij</id>
<activation>
<property>
@@ -254,73 +224,11 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <!--
- Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
- can rely on servlet container to ignore this in war file
- -->
- <scope>compile</scope>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-webserver</artifactId>
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jrebel</id>
- <properties>
- <!-- as used in the rebel.xml in the dom project -->
- <target.dir>target</target.dir>
- <isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
- <isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
- </properties>
- <build>
- <plugins>
- <!--
- mvn -P jrebel antrun:run \
- -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" \
- -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar"
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <target>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-
- <echo message=""/>
- <echo message=""/>
- <echo message="jrebel.jar = ${jrebel.jar}"/>
- <echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}"/>
- <echo message="target.dir = ${target.dir}"/>
- <echo message=""/>
- <echo message=""/>
-
- <exec executable="java" failonerror="true">
- <arg value="-javaagent:${jrebel.jar}"/>
- <arg value="-Drebel.log=false"/>
- <arg value="-Drebel.check_class_hash=true"/>
- <arg value="-Drebel.packages_exclude=org.apache.isis"/>
-
- <!-- as used in the rebel.xml in the dom project -->
- <arg value="-Dproject.root=${project.basedir}/.."/>
- <arg value="-Dtarget.dir=${target.dir}"/>
-
- <arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}"/>
- <arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}"/>
- <arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}"/>
- <arg value="-XX:MaxPermSize=128m"/>
- <arg value="-classpath"/>
- <arg value="${runtime_classpath}"/>
- <arg value="org.apache.isis.WebServer"/>
- </exec>
- </target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>