Author: pmd
Date: Wed Jun 20 19:34:20 2007
New Revision: 549329
URL: http://svn.apache.org/viewvc?view=rev&rev=549329
Log:
Model code *was* being generated in the target/src directory of each component.
Now it is being generated in model/src resolving the eclipse class path problem.
Added:
portals/bridges/trunk/applications/andromda-struts/common/model/
portals/bridges/trunk/applications/andromda-struts/common/model/src/
portals/bridges/trunk/applications/andromda-struts/core/model/
portals/bridges/trunk/applications/andromda-struts/core/model/src/
portals/bridges/trunk/applications/andromda-struts/web/model/
portals/bridges/trunk/applications/andromda-struts/web/model/src/
Modified:
portals/bridges/trunk/.classpath
portals/bridges/trunk/applications/andromda-struts/common/pom.xml
portals/bridges/trunk/applications/andromda-struts/core/pom.xml
portals/bridges/trunk/applications/andromda-struts/mda/pom.xml
portals/bridges/trunk/applications/andromda-struts/pom.xml
portals/bridges/trunk/applications/andromda-struts/web/pom.xml
Modified: portals/bridges/trunk/.classpath
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/.classpath?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/.classpath (original)
+++ portals/bridges/trunk/.classpath Wed Jun 20 19:34:20 2007
@@ -2,11 +2,6 @@
<classpath>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry excluding="**/.svn/*" kind="src"
path="common/src/java"/>
- <classpathentry excluding="**/.svn/*" kind="src"
path="applications/andromda-struts/common/src"/>
- <classpathentry excluding="**/.svn/*" kind="src"
path="applications/andromda-struts/common/target/src"/>
- <classpathentry excluding="**/.svn/*" kind="src"
path="applications/andromda-struts/core/target/src"/>
- <classpathentry excluding="**/.svn/*" kind="src"
path="applications/andromda-struts/web/target/src"/>
- <classpathentry excluding="**/.svn/*" kind="src"
path="applications/andromda-struts/web/src/main/java"/>
<classpathentry excluding="**/.svn/*" kind="src"
path="frameworks/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="jsf/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="perl/src/java"/>
@@ -17,6 +12,12 @@
<classpathentry excluding="**/.svn/*" kind="src"
path="applications/jpetstore/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src"
path="applications/jsf-demo/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src"
path="applications/springmvc/src/java"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/common/src"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/core/src"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/web/src/main/java"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/common/model/src"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/core/model/src"/>
+ <classpathentry kind="src"
path="applications/andromda-struts/web/model/src"/>
<classpathentry kind="var"
path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/itgroundwork/jars/phpportlet-1.0.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/struts/jars/struts-1.2.7.jar"/>
Modified: portals/bridges/trunk/applications/andromda-struts/common/pom.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/common/pom.xml?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/common/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/common/pom.xml Wed Jun
20 19:34:20 2007
@@ -19,36 +19,50 @@
-->
<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>
+ 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>
<groupId>org.apache.portals.bridges.andromda.struts</groupId>
<artifactId>andromda-struts</artifactId>
<version>1.0</version>
- </parent>
- <artifactId>andromda-struts-common</artifactId>
- <packaging>jar</packaging>
- <name>Network Monitor Common</name>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>andromda-struts-mda</artifactId>
- <version>${pom.version}</version>
- <type>pom</type>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.andromda.maven.plugins</groupId>
- <artifactId>andromda-multi-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ </parent>
+ <artifactId>andromda-struts-common</artifactId>
+ <packaging>jar</packaging>
+ <name>Network Monitor Common</name>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>andromda-struts-mda</artifactId>
+ <version>${pom.version}</version>
+ <type>pom</type>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromda-multi-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/model/src</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: portals/bridges/trunk/applications/andromda-struts/core/pom.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/core/pom.xml?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/core/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/core/pom.xml Wed Jun 20
19:34:20 2007
@@ -139,6 +139,20 @@
-->
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/model/src</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
Modified: portals/bridges/trunk/applications/andromda-struts/mda/pom.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/mda/pom.xml?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/mda/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/mda/pom.xml Wed Jun 20
19:34:20 2007
@@ -110,18 +110,18 @@
<conf.dir>${pom.basedir}/src/main/config</conf.dir>
<!-- cartridge output locations -->
<core.generated.dir>
- ${pom.basedir}/../core/target/src
+ ${pom.basedir}/../core/model/src
</core.generated.dir>
<core.manual.dir>
${pom.basedir}/../core/src/main/java
</core.manual.dir>
<web.generated.dir>
- ${pom.basedir}/../web/target/src
+ ${pom.basedir}/../web/model/src
</web.generated.dir>
<web.manual.dir>${pom.basedir}/../web/src/main</web.manual.dir>
<web.manual.java.dir>${web.manual.dir}/java</web.manual.java.dir>
<common.generated.dir>
- ${pom.basedir}/../common/target/src
+ ${pom.basedir}/../common/model/src
</common.generated.dir>
<!-- hibernate configuration -->
<!-- default strategy to use when using inhertiance -->
Modified: portals/bridges/trunk/applications/andromda-struts/pom.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/pom.xml?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/pom.xml Wed Jun 20
19:34:20 2007
@@ -367,7 +367,7 @@
</goals>
<configuration>
<sourceDirectories>
- <directory>target/src</directory>
+ <directory>model/src</directory>
</sourceDirectories>
</configuration>
</execution>
Modified: portals/bridges/trunk/applications/andromda-struts/web/pom.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/andromda-struts/web/pom.xml?view=diff&rev=549329&r1=549328&r2=549329
==============================================================================
--- portals/bridges/trunk/applications/andromda-struts/web/pom.xml (original)
+++ portals/bridges/trunk/applications/andromda-struts/web/pom.xml Wed Jun 20
19:34:20 2007
@@ -19,95 +19,95 @@
-->
<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>
+ 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>
<groupId>org.apache.portals.bridges.andromda.struts</groupId>
<artifactId>andromda-struts</artifactId>
<version>1.0</version>
- </parent>
- <artifactId>andromda-struts-web</artifactId>
- <packaging>war</packaging>
- <name>Network Monitor Web</name>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>andromda-struts-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>andromda-struts-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </dependency>
- <dependency>
- <groupId>displaytag</groupId>
- <artifactId>displaytag</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>itext</groupId>
- <artifactId>itext</artifactId>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.andromda</groupId>
- <artifactId>andromda-script-wrappers</artifactId>
- <scope>provided</scope>
- </dependency>
+ </parent>
+ <artifactId>andromda-struts-web</artifactId>
+ <packaging>war</packaging>
+ <name>Network Monitor Web</name>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>andromda-struts-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>andromda-struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>displaytag</groupId>
+ <artifactId>displaytag</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>itext</groupId>
+ <artifactId>itext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.andromda</groupId>
+ <artifactId>andromda-script-wrappers</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!--
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
</dependency>
-->
- <!-- Dependencies enables application to run as a portlet -->
+ <!-- Dependencies enables application to run as a portlet -->
<dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-struts-1.2.7</artifactId>
@@ -116,68 +116,82 @@
<groupId>displaytag</groupId>
<artifactId>displaytag-portlet</artifactId>
</dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <targetPath>../${pom.artifactId}-${pom.version}</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <tasks>
- <copy todir="${pom.basedir}/target/src" overwrite="true"
- failonerror="false">
- <fileset dir="${pom.basedir}/src/main/jsp">
- <include name="**/*" />
- </fileset>
- <fileset dir="${pom.basedir}/src/main">
- <include name="css/**" />
- <include name="images/**" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.andromda.maven.plugins</groupId>
- <artifactId>andromda-multi-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>target/src</warSourceDirectory>
- <excludes>**/*.java</excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.andromda.maven.plugins</groupId>
- <artifactId>andromdapp-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <deployLocation>${tomcat.home}/webapps</deployLocation>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <targetPath>../${pom.artifactId}-${pom.version}</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <tasks>
+ <copy todir="${pom.basedir}/model/src" overwrite="true"
+ failonerror="false">
+ <fileset dir="${pom.basedir}/src/main/jsp">
+ <include name="**/*" />
+ </fileset>
+ <fileset dir="${pom.basedir}/src/main">
+ <include name="css/**" />
+ <include name="images/**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromda-multi-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>model/src</warSourceDirectory>
+ <excludes>**/*.java</excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromdapp-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <deployLocation>${tomcat.home}/webapps</deployLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/model/src</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
