1.1 --- a/pom.xml Wed Nov 23 17:25:20 2011 +0300
1.2 +++ b/pom.xml Wed Nov 23 17:52:25 2011 +0300
1.3 @@ -1,18 +1,16 @@
1.4 -<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">
1.5 +<?xml version="1.0" encoding="UTF-8"?>
1.6 +<project>
1.7 <modelVersion>4.0.0</modelVersion>
1.8 - <groupId>ru.indvdum</groupId>
1.9 - <artifactId>mywork</artifactId>
1.10 - <version>0.0.1-SNAPSHOT</version>
1.11 - <description>My Work</description>
1.12 + <groupId>ru.indvdum.mywork</groupId>
1.13 + <artifactId>mywork-all</artifactId>
1.14 + <name>mywork</name>
1.15 + <version>0.0.1.0-SNAPSHOT</version>
1.16 + <packaging>pom</packaging>
1.17 <properties>
1.18 - <jetty.version>6.1.26</jetty.version>
1.19 - <vaadin.version>6.5.0</vaadin.version>
1.20 - <gwt.version>2.1.1</gwt.version>
1.21 - <oracle.jdbc.version>10.1.0.5.0</oracle.jdbc.version>
1.22 - <openjpa.version>2.1.1</openjpa.version>
1.23 <commons-dbcp.version>1.4</commons-dbcp.version>
1.24 <derby.version>10.8.2.2</derby.version>
1.25 <groovy.version>1.8.0</groovy.version>
1.26 + <openjpa.version>2.1.1</openjpa.version>
1.27 <maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
1.28 <groovy-eclipse-compiler.version>2.5.1-1</groovy-eclipse-compiler.version>
1.29 <build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
1.30 @@ -25,70 +23,22 @@
1.31 <resources>
1.32 <resource>
1.33 <directory>src/main/resources</directory>
1.34 - <filtering>false</filtering>
1.35 + <filtering>true</filtering>
1.36 </resource>
1.37 </resources>
1.38 <plugins>
1.39 <plugin>
1.40 + <groupId>org.apache.maven.plugins</groupId>
1.41 <artifactId>maven-compiler-plugin</artifactId>
1.42 <version>${maven-compiler-plugin.version}</version>
1.43 <configuration>
1.44 - <compilerId>groovy-eclipse-compiler</compilerId>
1.45 - <compilerArgument>nowarn</compilerArgument>
1.46 - <verbose>true</verbose>
1.47 + <source>1.6</source>
1.48 + <target>1.6</target>
1.49 + <encoding>UTF-8</encoding>
1.50 + <fork>true</fork>
1.51 + <meminitial>128m</meminitial>
1.52 + <maxmem>512m</maxmem>
1.53 </configuration>
1.54 - <dependencies>
1.55 - <dependency>
1.56 - <groupId>org.codehaus.groovy</groupId>
1.57 - <artifactId>groovy-eclipse-compiler</artifactId>
1.58 - <version>${groovy-eclipse-compiler.version}</version>
1.59 - </dependency>
1.60 - </dependencies>
1.61 - </plugin>
1.62 - <plugin>
1.63 - <groupId>org.codehaus.mojo</groupId>
1.64 - <artifactId>build-helper-maven-plugin</artifactId>
1.65 - <version>${build-helper-maven-plugin.version}</version>
1.66 - <executions>
1.67 - <execution>
1.68 - <id>add-source</id>
1.69 - <phase>generate-sources</phase>
1.70 - <goals>
1.71 - <goal>add-source</goal>
1.72 - </goals>
1.73 - <configuration>
1.74 - <sources>
1.75 - <source>src/main/groovy</source>
1.76 - <source>src/test/groovy</source>
1.77 - </sources>
1.78 - </configuration>
1.79 - </execution>
1.80 - </executions>
1.81 - </plugin>
1.82 - <plugin>
1.83 - <groupId>org.codehaus.mojo</groupId>
1.84 - <artifactId>openjpa-maven-plugin</artifactId>
1.85 - <configuration>
1.86 - <includes>**/model/**/*.class</includes>
1.87 - <addDefaultConstructor>true</addDefaultConstructor>
1.88 - <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
1.89 - </configuration>
1.90 - <executions>
1.91 - <execution>
1.92 - <id>enhancer</id>
1.93 - <phase>process-classes</phase>
1.94 - <goals>
1.95 - <goal>enhance</goal>
1.96 - </goals>
1.97 - </execution>
1.98 - </executions>
1.99 - <dependencies>
1.100 - <dependency>
1.101 - <groupId>org.apache.openjpa</groupId>
1.102 - <artifactId>openjpa</artifactId>
1.103 - <version>${openjpa.version}</version>
1.104 - </dependency>
1.105 - </dependencies>
1.106 </plugin>
1.107 <plugin>
1.108 <groupId>org.apache.maven.plugins</groupId>
1.109 @@ -98,40 +48,6 @@
1.110 <encoding>UTF-8</encoding>
1.111 </configuration>
1.112 </plugin>
1.113 - <plugin>
1.114 - <artifactId>maven-source-plugin</artifactId>
1.115 - <configuration>
1.116 - <attach>true</attach>
1.117 - </configuration>
1.118 - <executions>
1.119 - <execution>
1.120 - <phase>generate-sources</phase>
1.121 - <goals>
1.122 - <goal>jar</goal>
1.123 - </goals>
1.124 - </execution>
1.125 - </executions>
1.126 - </plugin>
1.127 - <plugin>
1.128 - <groupId>org.codehaus.mojo</groupId>
1.129 - <artifactId>exec-maven-plugin</artifactId>
1.130 - <version>1.2</version>
1.131 - <executions>
1.132 - <execution>
1.133 - <goals>
1.134 - <goal>exec</goal>
1.135 - </goals>
1.136 - </execution>
1.137 - </executions>
1.138 - <configuration>
1.139 - <executable>java</executable>
1.140 - <arguments>
1.141 - <argument>-classpath</argument>
1.142 - <classpath/>
1.143 - <argument>ru.indvdum.mywork.MyWork</argument>
1.144 - </arguments>
1.145 - </configuration>
1.146 - </plugin>
1.147 </plugins>
1.148 <pluginManagement>
1.149 <plugins>
1.150 @@ -169,6 +85,20 @@
1.151 </plugins>
1.152 </pluginManagement>
1.153 </build>
1.154 + <dependencyManagement>
1.155 + <dependencies>
1.156 + <dependency>
1.157 + <groupId>ru.indvdum.mywork</groupId>
1.158 + <artifactId>mywork-model</artifactId>
1.159 + <version>${project.version}</version>
1.160 + </dependency>
1.161 + <dependency>
1.162 + <groupId>ru.indvdum.mywork</groupId>
1.163 + <artifactId>mywork-web</artifactId>
1.164 + <version>${project.version}</version>
1.165 + </dependency>
1.166 + </dependencies>
1.167 + </dependencyManagement>
1.168 <dependencies>
1.169 <dependency>
1.170 <groupId>org.slf4j</groupId>
1.171 @@ -181,58 +111,9 @@
1.172 <version>${junit.version}</version>
1.173 <scope>test</scope>
1.174 </dependency>
1.175 - <dependency>
1.176 - <groupId>org.mortbay.jetty</groupId>
1.177 - <artifactId>jetty</artifactId>
1.178 - <version>${jetty.version}</version>
1.179 - </dependency>
1.180 - <dependency>
1.181 - <groupId>com.vaadin</groupId>
1.182 - <artifactId>vaadin</artifactId>
1.183 - <version>${vaadin.version}</version>
1.184 - </dependency>
1.185 - <dependency>
1.186 - <groupId>com.vaadin.addon</groupId>
1.187 - <artifactId>jpacontainer-addon-agpl-3.0</artifactId>
1.188 - <version>1.2.0</version>
1.189 - <exclusions>
1.190 - <exclusion>
1.191 - <groupId>javax.persistence</groupId>
1.192 - <artifactId>persistence-api</artifactId>
1.193 - </exclusion>
1.194 - </exclusions>
1.195 - </dependency>
1.196 - <dependency>
1.197 - <groupId>com.google.gwt</groupId>
1.198 - <artifactId>gwt-user</artifactId>
1.199 - <version>${gwt.version}</version>
1.200 - </dependency>
1.201 - <dependency>
1.202 - <groupId>com.oracle</groupId>
1.203 - <artifactId>ojdbc14</artifactId>
1.204 - <version>${oracle.jdbc.version}</version>
1.205 - </dependency>
1.206 - <dependency>
1.207 - <groupId>org.apache.openjpa</groupId>
1.208 - <artifactId>openjpa</artifactId>
1.209 - <version>${openjpa.version}</version>
1.210 - </dependency>
1.211 - <dependency>
1.212 - <groupId>org.codehaus.groovy</groupId>
1.213 - <artifactId>groovy-all</artifactId>
1.214 - <version>${groovy.version}</version>
1.215 - </dependency>
1.216 - <dependency>
1.217 - <groupId>commons-dbcp</groupId>
1.218 - <artifactId>commons-dbcp</artifactId>
1.219 - <version>${commons-dbcp.version}</version>
1.220 - <scope>test</scope>
1.221 - </dependency>
1.222 - <dependency>
1.223 - <groupId>org.apache.derby</groupId>
1.224 - <artifactId>derby</artifactId>
1.225 - <version>${derby.version}</version>
1.226 - <scope>test</scope>
1.227 - </dependency>
1.228 </dependencies>
1.229 + <modules>
1.230 + <module>mywork-model</module>
1.231 + <module>mywork-web</module>
1.232 + </modules>
1.233 </project>