Skip to content

Commit

Permalink
minor adaptations to pom files
Browse files Browse the repository at this point in the history
  • Loading branch information
Reiner Jung committed May 2, 2016
1 parent a0d92bb commit aa3bf0c
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 79 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
**/.project
**/target/**
**/.settings/**
**/.classpath

111 changes: 56 additions & 55 deletions cocome-maven-project/cloud-logic-service/cloud-logic-core-impl/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>cloud-logic-service</artifactId>
<groupId>org.cocome</groupId>
<version>1.1</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>cloud-logic-service</artifactId>
<groupId>org.cocome</groupId>
<version>1.1</version>
</parent>

<artifactId>cloud-logic-core-impl</artifactId>
<name>Cloud Logic Core - Implementation</name>
<description>cloud-logic-core-impl</description>
<packaging>ejb</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>cloud-logic-core-impl</artifactId>
<name>Cloud Logic Core - Implementation</name>
<description>cloud-logic-core-impl</description>
<packaging>ejb</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-all-6.0</artifactId>
<scope>provided</scope>
Expand All @@ -74,6 +75,6 @@
<artifactId>cloud-logic-core-api</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</dependencies>

</project>
106 changes: 82 additions & 24 deletions cocome-maven-project/cloud-web-frontend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<artifactId>cloud-web-frontend</artifactId>
<packaging>war</packaging>
<name>Cloud Web Frontend</name>
<version>1.1</version>

<parent>
<groupId>org.cocome</groupId>
Expand Down Expand Up @@ -39,6 +38,12 @@
<artifactId>cloud-logic-core-services</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.2-20</version>
</dependency>

</dependencies>

<build>
Expand All @@ -51,32 +56,43 @@
<target>${java-version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.glassfish.maven.plugin</groupId>
<artifactId>maven-glassfish-plugin</artifactId>

<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.4.9</version>
<configuration>
<glassfishDirectory>${local.glassfish.home}</glassfishDirectory>
<user>${web.user}</user>
<!-- <adminPassword>${web.password}</adminPassword> -->
<passwordFile>${web.passwordFile}</passwordFile>
<domain>
<name>${web.domain}</name>
<host>${web.host}</host>
<httpPort>${web.httpPort}</httpPort>
<adminPort>${web.adminPort}</adminPort>
</domain>
<components>
<component>
<name>${project.artifactId}</name>
<artifact>target/${project.artifactId}-${project.version}.${project.packaging}</artifact>
</component>
</components>
<debug>true</debug>
<echo>true</echo>
</configuration>
<wait>true</wait>
<container>
<containerId>glassfish4x</containerId>
<type>remote</type>
</container>
<configuration>
<type>runtime</type>
<properties>
<cargo.hostname>${web.host}</cargo.hostname>
<cargo.remote.username>${web.user}</cargo.remote.username>
<cargo.remote.password>${web.password}</cargo.remote.password>
<cargo.glassfish.admin.port>${web.adminPort}</cargo.glassfish.admin.port>
<cargo.glassfish.domain.name>${web.domain}</cargo.glassfish.domain.name>
</properties>
</configuration>
<deployables>
<deployable>
<location>${project.build.directory}/${project.build.finalName}.${project.packaging}</location>
<properties>

</properties>
<type>war</type>
</deployable>
</deployables>
</configuration>
<dependencies>
<dependency>
<groupId>org.glassfish.deployment</groupId>
<artifactId>deployment-client</artifactId>
<version>3.2-b06</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>gf-undeploy</id>
Expand All @@ -94,6 +110,48 @@
</execution>
</executions>
</plugin>
<!-- <plugin> -->
<!-- <groupId>org.glassfish.maven.plugin</groupId> -->
<!-- <artifactId>maven-glassfish-plugin</artifactId> -->

<!-- <configuration> -->
<!-- <glassfishDirectory>${local.glassfish.home}</glassfishDirectory> -->
<!-- <user>${web.user}</user> -->
<!-- <adminPassword>${web.password}</adminPassword> -->
<!-- <passwordFile>${web.passwordFile}</passwordFile> -->
<!-- <domain> -->
<!-- <name>${web.domain}</name> -->
<!-- <host>${web.host}</host> -->
<!-- <httpPort>${web.httpPort}</httpPort> -->
<!-- <adminPort>${web.adminPort}</adminPort> -->
<!-- </domain> -->
<!-- <components> -->
<!-- <component> -->
<!-- <name>${project.artifactId}</name> -->
<!-- <artifact>target/${project.artifactId}-${project.version}.${project.packaging}</artifact> -->
<!-- </component> -->
<!-- </components> -->
<!-- <debug>true</debug> -->
<!-- <echo>true</echo> -->
<!-- </configuration> -->

<!-- <executions> -->
<!-- <execution> -->
<!-- <id>gf-undeploy</id> -->
<!-- <goals> -->
<!-- <goal>undeploy</goal> -->
<!-- </goals> -->
<!-- <phase>post-clean</phase> -->
<!-- </execution> -->
<!-- <execution> -->
<!-- <id>gf-deploy</id> -->
<!-- <goals> -->
<!-- <goal>deploy</goal> -->
<!-- </goals> -->
<!-- <phase>install</phase> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down

0 comments on commit aa3bf0c

Please sign in to comment.