2
0
Fork 0

[svn r368] updated maven names

This commit is contained in:
willemc 2008-12-07 19:26:44 +01:00
parent 818ed10649
commit a9520b3804
11 changed files with 365 additions and 174 deletions

View file

@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="www/WEB-INF/classes" path="src"/>
<classpathentry kind="src" output="www/WEB-INF/classes" path="tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/idcanet-x4o-bin.jar"/>
<classpathentry kind="lib" path="lib/juel-2.1.0-rc1.jar"/>
<classpathentry kind="lib" path="lib/juel-2.1.0-rc1-impl.jar"/>
<classpathentry kind="lib" path="lib/idcanet-xtes-bin.jar"/>
<classpathentry kind="lib" path="lib/idcanet-serv5-bin.jar"/>
<classpathentry kind="lib" path="lib/hibernate3.jar"/>
<classpathentry kind="lib" path="lib/jgoodies-binding.jar"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="SWT_CONTAINER/JFACE/PLATFORM"/>
<classpathentry kind="lib" path="lib/idcanet-jmx-bin.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/idcanet-fff-bin.jar"/>
<classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
<classpathentry kind="lib" path="lib/microba-0.4.2-bin.jar"/>
<classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/>
<classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
<classpathentry kind="lib" path="lib/ldap.jar"/>
<classpathentry kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/>
<classpathentry kind="output" path="www/WEB-INF/classes"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View file

@ -35,8 +35,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

500
pom.xml
View file

@ -1,166 +1,362 @@
<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>com.idcanet</groupId>
<artifactId>vasc</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Vasc with maven</name>
<url>http://maven.apache.org</url>
<repositories>
<repository>
<id>maven.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
<modelVersion>4.0.0</modelVersion>
<groupId>com.idcanet.vasc</groupId>
<artifactId>vasc-main</artifactId>
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>vasc</name>
<description>Simple crud'ing for all.</description>
<url>http://www.x4o.org/vasc</url>
<organization>
<name>IDCA</name>
<url>http://www.idca.nl</url>
</organization>
<issueManagement>
<system>Trac</system>
<url>https://decaid.idca.nl/trac/oss/</url>
</issueManagement>
<scm>
<connection>scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.vasc/</connection>
<developerConnection>scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.vasc/</developerConnection>
<url>https://decaid.idca.nl/svn/oss/com.idcanet.vasc/</url>
</scm>
<developers>
<developer>
<id>willem.cazander</id>
<name>Willem Cazander</name>
<email>w.cazander@gmail.com</email>
<organization>IDCA</organization>
<timezone>+2</timezone>
<roles>
<role>Project Manager</role>
<role>Architect</role>
</roles>
</developer>
<developer>
<id>sqrbass</id>
<name>Bas van Oostveen</name>
<email></email>
<organization>IDCA</organization>
<timezone>+2</timezone>
<roles>
<role>Architect Reviewer</role>
</roles>
</developer>
</developers>
<repositories>
<repository>
<id>maven.jboss.org</id>
<name>JBoss.org maven2 Repository</name>
<url>http://repository.jboss.org/maven2/</url>
<layout>default</layout>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>dk.eobjects.metamodel</groupId>
<artifactId>MetaModel-full</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>hibernate3-maven-plugin</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>com.novell.ldap</groupId>
<artifactId>jldap</artifactId>
<version>4.3</version>
</dependency>
<dependency>
<groupId>com.idcanet</groupId>
<artifactId>x4o</artifactId>
<id>jboss</id>
<name>JBoss Repository Switchboard</name>
<layout>default</layout>
<url>http://repository.jboss.com/maven2/</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>ops4j-microba</id>
<name>ops4j.org</name>
<layout>default</layout>
<url>http://repository.ops4j.org/maven2/</url>
<snapshots><enabled>false</enabled></snapshots>
</repository>
</repositories>
<dependencies>
<!-- X4O dependcy -->
<dependency>
<groupId>com.idcanet.x4o</groupId>
<artifactId>x4o-main</artifactId>
<version>0.8-SNAPSHOT</version>
</dependency>
</dependency>
</dependencies>
<build>
<directory>target</directory>
<outputDirectory>target/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
<testOutputDirectory>target/test-classes</testOutputDirectory>
<sourceDirectory>src/</sourceDirectory>
<testSourceDirectory>tests/</testSourceDirectory>
<!--
<scriptSourceDirectory>build/</scriptSourceDirectory>
<testSourceDirectory>test/</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
</testResources>
<!-- Serv5 depency -->
<dependency>
<groupId>com.idcanet.serv5</groupId>
<artifactId>serv5-main</artifactId>
<version>0.6-SNAPSHOT</version>
</dependency>
<!-- Xtes depency -->
<dependency>
<groupId>com.idcanet.xtes</groupId>
<artifactId>xtes-main</artifactId>
<version>0.6-SNAPSHOT</version>
</dependency>
<!-- FFF depency -->
<dependency>
<groupId>com.idcanet.fff</groupId>
<artifactId>fff-main</artifactId>
<version>0.8-SNAPSHOT</version>
</dependency>
<!-- Ldap depency -->
<dependency>
<groupId>com.novell.ldap</groupId>
<artifactId>jldap</artifactId>
<version>4.3</version>
</dependency>
<!-- Swing date editor depency -->
<dependency>
<groupId>com.michaelbaranov</groupId>
<artifactId>microba</artifactId>
<version>0.4.4.1</version>
</dependency>
<!-- SWT depency TODO: linux only, wait for 3.4 !! -->
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<version>3.3.0-v3346</version>
</dependency>
<!-- Unit tests cases -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.8</version>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
</dependencies>
<!--
<profiles>
<profile>
<id>unix</id>
<activation>
<os>
<family>unix</family>
</os>
</activation>
<properties>
<swt.os-specific-dep>swt-linux-gtk</swt.os-specific-dep>
<swt.version>3.2.2</swt.version>
</properties>
</profile>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<swt.os-specific-dep>swt-win32</swt.os-specific-dep>
<swt.version>3.2.2</swt.version>
</properties>
</profile>
<profile>
<id>mac</id>
<activation>
<os>
<family>macosx</family>
</os>
</activation>
<properties>
<swt.os-specific-dep>swt-macosx</swt.os-specific-dep>
<swt.version>3.2.2</swt.version>
</properties>
</profile>
</profiles>
-->
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
<build>
<plugins>
<!-- Compile source -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<!-- Generate site -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
<!-- Run tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4</version>
<configuration></configuration>
</plugin>
</plugins>
<!-- Build documention -->
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<!-- Any parameters common to both HTML and PDF go here -->
<configuration>
<sourceDirectory>src/main/docbook/</sourceDirectory>
<targetDirectory>target/site/docbook/</targetDirectory>
<!-- input config -->
<includes>*.xml</includes>
<!-- <foCustomization>src/main/config/docbook-fo.xsl</foCustomization> -->
<!-- runtime config -->
<xincludeSupported>true</xincludeSupported>
<entities><!-- pom vars to docbook vars -->
<entity>
<name>version</name>
<value>${version}</value>
</entity>
</entities>
<!-- output config -->
<chunkedOutput>true</chunkedOutput>
<!-- <htmlStylesheet>http://.....</htmlStylesheet> -->
</configuration>
<executions>
</build>
<!--
|
|
|
-->
<distributionManagement>
<!--
<repository>
<id>mycompany-repository</id>
<name>MyCompany Repository</name>
<url>scp://repository.mycompany.com/repository/maven2</url>
</repository>
-->
</distributionManagement>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
<!--
<dependency>
<groupId>com.mycompany.myappfrmk.console</groupId>
<artifactId>console-svcs</artifactId>
<type>ejb</type>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.mycompany.myappfrmk.console</groupId>e
<artifactId>web-console</artifactId>
<type>war</type>
<version>1.0</version>
</dependency>
</dependencies>
<build>
<plugin>
<execution>
<id>create-pdf-docs</id>
<phase>site</phase>
<goals><goal>generate-pdf</goal></goals>
<configuration>
<!-- Any parameters specific to the PDF version go here -->
<imgSrcPath>file:///${basedir}/src/main/docbook/</imgSrcPath>
</configuration>
</execution>
<execution>
<id>create-html-docs</id>
<phase>site</phase>
<goals><goal>generate-html</goal></goals>
<configuration>
<!-- This copies content (images, etc) for the HTML version -->
<preProcess>
<copy todir="target/site/docbook/images">
<fileset dir="src/main/docbook/images"/>
</copy>
</preProcess>
<!-- Any parameters specific to HTML version go here -->
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.docbook</groupId>
<artifactId>docbook-xml</artifactId>
<version>4.4</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<generateApplicationXml>true</generateApplicationXml>
<generatedDescriptorLocation>${basedir}/target</generatedDescriptorLocation>
<finalName>FrmkConsole</finalName>
</configuration>
</plugin>
</plugins>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>swt</groupId>
<artifactId>${swt.os-specific-dep}-native</artifactId>
<version>${swt.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>
${project.build.directory}/appassembler/lib
</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
-->
<reporting>
<outputDirectory>target/site</outputDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>summary</report>
<report>dependencies</report>
<report>project-team</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.0</version>
<configuration>
<xmlPath>${basedir}/src/site/changes.xml</xmlPath>
</configuration>
<reportSets>
<reportSet>
<reports><report>changes-report</report></reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
<!-- END -->
</project>

View file

@ -29,9 +29,6 @@ package com.idcanet.vasc;
import java.io.InputStream;
import java.util.logging.LogManager;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import com.idcanet.vasc.frontends.swt.SwtVascFrontend;
@ -60,6 +57,7 @@ public class SWTTest extends TestCase {
public void testAll() throws Exception {
// get GUI
/*
Display display = new Display();
Shell shell = new Shell(display);
shell.setText("Vasc Test - Swt");
@ -79,6 +77,8 @@ public class SWTTest extends TestCase {
}
}
display.dispose();
*/
}

View file

@ -117,7 +117,7 @@ public class TestTable {
VascController c = getDefaultVascController();
VascParser parser = new VascParser(c);
parser.parseResource("resources/vasc/tables.xml");
parser.parseResource("vasc/tables.xml");
VascEntry entry = parser.getVascController().getVascEntryControllerResolver().getVascEntryController().getVascEntryById("test1");
fill(entry,c);