Commit ba7b78a6 by Tuomas Riihimäki

Rename names to be compatible with maven builds

1 parent 243983c0
Showing with 148 additions and 262 deletions
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
*/build */build
*.class *.class
.DS_Store .DS_Store
/code/MoyaDatabase/src/fi/codecrew/moya/model/*_.java
/code/MoyaDatabase/src/fi/codecrew/moya/model/*/*_.java
*~ *~
.metadata .metadata
.classpath
.project
.settings
/code/*/target/ /code/*/target/
/code/*/test-output/ /code/*/test-output/
moya-git.properties moya-git.properties
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-utils-test</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>fi.codecrew.moya</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>moya-authmodule-client</artifactId> <artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version> <parent>
<build> <groupId>fi.codecrew.moya</groupId>
<sourceDirectory>src</sourceDirectory> <artifactId>moya-parent-root</artifactId>
<resources> <version>1.0</version>
<resource> <relativePath>../moya-parent/pom-root.xml</relativePath>
<directory>src</directory> </parent>
<excludes> <dependencies>
<exclude>**/*.java</exclude> <dependency>
</excludes> <groupId>javax</groupId>
</resource> <artifactId>javaee-api</artifactId>
</resources> <version>7.0</version>
<plugins> <scope>provided</scope>
<plugin> </dependency>
<artifactId>maven-compiler-plugin</artifactId> </dependencies>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule</artifactId> <artifactId>moya-authmodule</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.glassfish.main.security</groupId> <groupId>org.glassfish.main.security</groupId>
...@@ -27,7 +12,13 @@ ...@@ -27,7 +12,13 @@
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId> <artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version> <version>${moya.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent-root</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom-root.xml</relativePath>
</parent>
</project> </project>
\ No newline at end of file
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>fi.codecrew.moya</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>moya-beans-client</artifactId> <artifactId>moya-beans-client</artifactId>
<version>0.2.0</version> <build>
<build> <sourceDirectory>ejbModule</sourceDirectory>
<sourceDirectory>ejbModule</sourceDirectory>
<resources> </build>
<resource> <dependencies>
<directory>ejbModule</directory> <dependency>
<excludes> <groupId>fi.codecrew.moya</groupId>
<exclude>**/*.java</exclude> <artifactId>moya-database</artifactId>
</excludes> <version>${moya.version}</version>
</resource> </dependency>
</resources>
<plugins> </dependencies>
<plugin> <parent>
<artifactId>maven-compiler-plugin</artifactId> <groupId>fi.codecrew.moya</groupId>
<version>3.1</version> <artifactId>moya-parent</artifactId>
<configuration> <version>1.0</version>
<source>1.7</source> <relativePath>../moya-parent/pom.xml</relativePath>
<target>1.7</target> </parent>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-database</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId> <artifactId>moya-beans</artifactId>
<version>0.2.0</version>
<packaging>ejb</packaging> <packaging>ejb</packaging>
<build> <build>
<sourceDirectory>ejbModule</sourceDirectory> <sourceDirectory>ejbModule</sourceDirectory>
...@@ -17,14 +15,6 @@ ...@@ -17,14 +15,6 @@
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-ejb-plugin</artifactId> <artifactId>maven-ejb-plugin</artifactId>
<version>2.3</version> <version>2.3</version>
<configuration> <configuration>
...@@ -33,46 +23,26 @@ ...@@ -33,46 +23,26 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>iudex</id>
<url>http://iudex.fi/maven/</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId> <artifactId>moya-beans-client</artifactId>
<version>0.2.0</version> <version>${moya.version}</version>
</dependency> </dependency>
<dependency>
<groupId>fi.iudex.pdfjet</groupId>
<artifactId>pdfjet</artifactId>
<version>0.0.0-2013-08-19</version>
</dependency>
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-authmodule-client</artifactId> <artifactId>moya-authmodule-client</artifactId>
<version>0.2.0</version> <version>${moya.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4-alpha1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project> </project>
\ No newline at end of file
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>fi.codecrew.moya</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>moya-cardprinter</artifactId> <artifactId>moya-cardprinter</artifactId>
<version>0.2.0</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
...@@ -23,4 +10,10 @@ ...@@ -23,4 +10,10 @@
<version>1.1.2</version> <version>1.1.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId>
<version>1.0</version>
<relativePath>../moya-parent/pom.xml</relativePath>
</parent>
</project> </project>
\ No newline at end of file
<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/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>fi.codecrew.moya</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>moya-database</artifactId> <artifactId>moya-database</artifactId>
<version>0.2.0</version>
<build> <dependencies>
<sourceDirectory>src</sourceDirectory> <dependency>
<resources> <groupId>fi.codecrew.moya</groupId>
<resource> <artifactId>moya-utils</artifactId>
<directory>src</directory> <version>${moya.version}</version>
<excludes> </dependency>
<exclude>**/*.java</exclude> <dependency>
</excludes> <groupId>org.ancoron.postgresql</groupId>
</resource> <artifactId>org.ancoron.postgresql.jpa</artifactId>
</resources> <version>9.1.901.jdbc4.1-rc9</version>
<plugins> <exclusions>
<plugin> <exclusion>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>javax.persistence</artifactId>
<version>3.1</version> <groupId>org.eclipse.persistence</groupId>
<configuration> </exclusion>
<source>1.7</source> <exclusion>
<target>1.7</target> <artifactId>org.eclipse.persistence.osgi</artifactId>
</configuration> <groupId>org.eclipse.persistence</groupId>
</plugin> </exclusion>
</plugins> <exclusion>
</build> <artifactId>org.eclipse.persistence.core</artifactId>
<dependencies> <groupId>org.eclipse.persistence</groupId>
<dependency> </exclusion>
<groupId>fi.codecrew.moya</groupId> <exclusion>
<artifactId>moya-utils</artifactId> <artifactId>org.postgresql</artifactId>
<version>0.2.0</version> <groupId>org.ancoron.postgresql</groupId>
</dependency> </exclusion>
<dependency> <exclusion>
<groupId>org.ancoron.postgresql</groupId> <artifactId>org.postgresql.net</artifactId>
<artifactId>org.ancoron.postgresql.jpa</artifactId> <groupId>org.ancoron.postgresql</groupId>
<version>9.1.901.jdbc4.1-rc9</version> </exclusion>
<exclusions> </exclusions>
<exclusion> </dependency>
<artifactId>javax.persistence</artifactId> <dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.postgresql</groupId>
</exclusion> <artifactId>postgresql</artifactId>
<exclusion> <version>9.3-1102-jdbc41</version>
<artifactId>org.eclipse.persistence.osgi</artifactId> <scope>provided</scope>
<groupId>org.eclipse.persistence</groupId> </dependency>
</exclusion> <dependency>
<exclusion> <groupId>org.ancoron.postgresql</groupId>
<artifactId>org.eclipse.persistence.core</artifactId> <artifactId>org.postgresql.net</artifactId>
<groupId>org.eclipse.persistence</groupId> <version>9.1.901.jdbc4.1-rc9</version>
</exclusion> <exclusions>
<exclusion> <exclusion>
<artifactId>org.postgresql</artifactId> <artifactId>org.postgresql</artifactId>
<groupId>org.ancoron.postgresql</groupId> <groupId>org.ancoron.postgresql</groupId>
</exclusion> </exclusion>
<exclusion> </exclusions>
<artifactId>org.postgresql.net</artifactId> </dependency>
<groupId>org.ancoron.postgresql</groupId>
</exclusion> <dependency>
</exclusions> <groupId>org.eclipse.persistence</groupId>
</dependency> <artifactId>org.eclipse.persistence.core</artifactId>
<dependency> <version>2.5.2-RC1</version>
<groupId>org.postgresql</groupId> <scope>provided</scope>
<artifactId>postgresql</artifactId> </dependency>
<version>9.3-1102-jdbc41</version> </dependencies>
</dependency> <parent>
<dependency> <groupId>fi.codecrew.moya</groupId>
<groupId>org.ancoron.postgresql</groupId> <artifactId>moya-parent</artifactId>
<artifactId>org.postgresql.net</artifactId> <version>1.0</version>
<version>9.1.901.jdbc4.1-rc9</version> <relativePath>../moya-parent/pom.xml</relativePath>
<exclusions> </parent>
<exclusion>
<artifactId>org.postgresql</artifactId>
<groupId>org.ancoron.postgresql</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.7</version>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!