Added build info and clean poms a bit.
This commit is contained in:
parent
c259e28e44
commit
afd821c360
26
pom.xml
26
pom.xml
|
@ -178,7 +178,7 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Compile source -->
|
||||
<plugin>
|
||||
|
@ -266,6 +266,30 @@
|
|||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>${maven-release-plugin.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.m2e</groupId>
|
||||
<artifactId>lifecycle-mapping</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<configuration>
|
||||
<lifecycleMappingMetadata>
|
||||
<pluginExecutions>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<versionRange>${maven-antrun-plugin.version}</versionRange>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore />
|
||||
</action>
|
||||
</pluginExecution>
|
||||
</pluginExecutions>
|
||||
</lifecycleMappingMetadata>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
|
|
@ -10,10 +10,10 @@
|
|||
<name>vasc-backend</name>
|
||||
<description>vasc-backend</description>
|
||||
<modules>
|
||||
<module>vasc-backend-jpa</module>
|
||||
<module>vasc-backend-ldap</module>
|
||||
<module>vasc-backend-mongodb</module>
|
||||
<module>vasc-backend-jdbc</module>
|
||||
<module>vasc-backend-metamodel</module>
|
||||
<module>vasc-backend-jpa</module>
|
||||
<module>vasc-backend-ldap</module>
|
||||
<module>vasc-backend-mongodb</module>
|
||||
<module>vasc-backend-jdbc</module>
|
||||
<module>vasc-backend-metamodel</module>
|
||||
</modules>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -10,10 +10,10 @@
|
|||
<name>vasc-backend-jdbc</name>
|
||||
<description>vasc-backend-jdbc</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -5,16 +5,14 @@
|
|||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-backend-jpa</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-backend-jpa</name>
|
||||
<description>vasc-backend-jpa</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.persistence</groupId>
|
||||
|
@ -23,10 +21,10 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-annotations</artifactId>
|
||||
<version>${hibernate-annotations.version}</version>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-annotations</artifactId>
|
||||
<version>${hibernate-annotations.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -5,21 +5,19 @@
|
|||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-backend-ldap</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-backend-ldap</name>
|
||||
<description>vasc-backend-ldap</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.novell.ldap</groupId>
|
||||
<artifactId>jldap</artifactId>
|
||||
<version>${jldap.version}</version>
|
||||
<groupId>com.novell.ldap</groupId>
|
||||
<artifactId>jldap</artifactId>
|
||||
<version>${jldap.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
package net.forwardfire.vasc.impl.frontend;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
|
@ -125,6 +126,15 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
|
|||
|
||||
*/
|
||||
|
||||
private List<VascEntryField> filter() {
|
||||
List<VascEntryField> result = new ArrayList<VascEntryField>(50);
|
||||
for (VascEntryField vef:entry.getVascEntryFields()) {
|
||||
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public List<VascEntryField> getFieldsList() {
|
||||
List<VascEntryField> result = new ArrayList<VascEntryField>(50);
|
||||
result.addAll(entry.getVascEntryFields());
|
||||
|
|
|
@ -5,9 +5,7 @@
|
|||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<artifactId>vasc-demo-petstore-j2ee5</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>vasc-demo-petstore-j2ee5</name>
|
||||
<description>vasc-demo-petstore-j2ee5</description>
|
||||
|
|
|
@ -5,9 +5,7 @@
|
|||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<artifactId>vasc-demo-petstore-j2ee5-ear</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-demo-petstore-j2ee5-ear</name>
|
||||
<description>vasc-demo-petstore-j2ee5-ear</description>
|
||||
</project>
|
|
@ -5,9 +5,7 @@
|
|||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc.demos</groupId>
|
||||
<artifactId>vasc-demo-petstore-j2ee5-war</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-demo-petstore-j2ee5-war</name>
|
||||
<description>vasc-demo-petstore-j2ee5-war</description>
|
||||
</project>
|
|
@ -9,6 +9,46 @@
|
|||
<artifactId>vasc-demo-server-core</artifactId>
|
||||
<name>vasc-demo-server-core</name>
|
||||
<description>vasc-server-tech-core</description>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>${maven-antrun-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-version-class</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<target>
|
||||
<mkdir dir="${project.build.directory}/generated-sources/net/forwardfire/vasc/demo/server/core" />
|
||||
<echo file="${project.build.directory}/generated-sources/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfoImpl.java">
|
||||
package net.forwardfire.vasc.demo.server.core;
|
||||
/** Automatically generated by ant. */
|
||||
public class VascTechDemoBuildInfoImpl implements VascTechDemoBuildInfo {
|
||||
static public final String VERSION = "${project.version}";
|
||||
static public final String BUILD_DATE = "${maven.build.timestamp}";
|
||||
public String getVersion() {
|
||||
return VERSION;
|
||||
}
|
||||
public String getBuildDate() {
|
||||
return BUILD_DATE;
|
||||
}
|
||||
}
|
||||
</echo>
|
||||
</target>
|
||||
<sourceRoot>
|
||||
${project.build.directory}/generated-sources
|
||||
</sourceRoot>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.x4o</groupId>
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* Copyright 2007-2012 forwardfire.net All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification, are permitted provided
|
||||
* that the following conditions are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright notice, this list of conditions and the
|
||||
* following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
|
||||
* the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
||||
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package net.forwardfire.vasc.demo.server.core;
|
||||
|
||||
/**
|
||||
* VascTechDemoBuildInfo provides interfaces for build system so we have version and build date.
|
||||
*
|
||||
* @author Willem Cazander
|
||||
* @version 1.0 Dec 1, 2012
|
||||
*/
|
||||
public interface VascTechDemoBuildInfo {
|
||||
|
||||
/**
|
||||
* @return Returns the build version.
|
||||
*/
|
||||
String getVersion();
|
||||
|
||||
/**
|
||||
* @return Returns the build date.
|
||||
*/
|
||||
String getBuildDate();
|
||||
}
|
|
@ -25,6 +25,7 @@ package net.forwardfire.vasc.demo.server.core;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.Date;
|
||||
import java.util.logging.Handler;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
|
@ -52,6 +53,7 @@ public class VascTechDemoStartup {
|
|||
private TomcatService tomcatService = null;
|
||||
private VascControllerService vascControllerService = null;
|
||||
private ServerGuiService swingGuiService = null;
|
||||
private VascTechDemoBuildInfo buildInfo = null;
|
||||
static private VascTechDemoStartup instance = null;
|
||||
|
||||
/**
|
||||
|
@ -136,6 +138,30 @@ public class VascTechDemoStartup {
|
|||
logger.info("Logging is ready for application log;");
|
||||
}
|
||||
|
||||
|
||||
private void setupBuildInfo() {
|
||||
if (buildInfo!=null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
Class<?> infoClass = Class.forName(VascTechDemoBuildInfo.class.getPackage().getName()+"."+VascTechDemoBuildInfo.class.getSimpleName()+"Impl");
|
||||
buildInfo = (VascTechDemoBuildInfo)infoClass.newInstance();
|
||||
return;
|
||||
} catch (Exception e) {
|
||||
logger.warning("Could not load build info impl fallback to local one.");
|
||||
}
|
||||
buildInfo = new VascTechDemoBuildInfo() {
|
||||
@Override
|
||||
public String getVersion() {
|
||||
return "0.0.0-dev";
|
||||
}
|
||||
@Override
|
||||
public String getBuildDate() {
|
||||
return new Date().toString();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Init all demo service beans.
|
||||
* @param argu
|
||||
|
@ -147,6 +173,7 @@ public class VascTechDemoStartup {
|
|||
System.setProperty("java.security.auth.login.config", "file:conf/login.config");
|
||||
setupAutoDir();
|
||||
setupLogging();
|
||||
setupBuildInfo();
|
||||
logger.info("VascTechDemo initializing ...");
|
||||
databaseService = new DatabaseService();
|
||||
tomcatService = new TomcatService();
|
||||
|
@ -239,4 +266,8 @@ public class VascTechDemoStartup {
|
|||
public ServerGuiService getSwingGuiService() {
|
||||
return swingGuiService;
|
||||
}
|
||||
|
||||
public VascTechDemoBuildInfo getBuildInfo() {
|
||||
return buildInfo;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -98,7 +98,7 @@ public class JStatusPanel extends JPanel implements ActionListener {
|
|||
statusPanel.add(new JLabel("vasc-demo-server-core"));
|
||||
|
||||
statusPanel.add(new JLabel("Version:"));
|
||||
statusPanel.add(new JLabel("0.X.X"));
|
||||
statusPanel.add(new JLabel(VascTechDemoStartup.getInstance().getBuildInfo().getVersion()));
|
||||
|
||||
statusPanel.add(new JLabel("Groups:"));
|
||||
statusPanel.add(infoVascGroups);
|
||||
|
|
|
@ -10,42 +10,42 @@
|
|||
<name>vasc-frontend-cxf-server</name>
|
||||
<description>vasc-frontend-cxf-server</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-frontend-cxf-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-databinding-jaxb</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxws</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-frontend-cxf-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-databinding-jaxb</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxws</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
||||
<version>${cxf-rt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -9,35 +9,27 @@
|
|||
<name>vasc-frontend-swing</name>
|
||||
<description>vasc-frontend-swing</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- FFF depency
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc.lib.fff</groupId>
|
||||
<artifactId>fff-icons</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
-->
|
||||
<!-- Swing date editor depency -->
|
||||
<dependency>
|
||||
<groupId>com.michaelbaranov</groupId>
|
||||
<artifactId>microba</artifactId>
|
||||
<version>${microba.version}</version>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.odysseus.juel</groupId>
|
||||
<artifactId>juel</artifactId>
|
||||
<version>${juel.version}</version>
|
||||
<scope>test</scope>
|
||||
<groupId>com.michaelbaranov</groupId>
|
||||
<artifactId>microba</artifactId>
|
||||
<version>${microba.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc.test</groupId>
|
||||
<artifactId>vasc-test-frontend-data</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
<dependency>
|
||||
<groupId>de.odysseus.juel</groupId>
|
||||
<artifactId>juel</artifactId>
|
||||
<version>${juel.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc.test</groupId>
|
||||
<artifactId>vasc-test-frontend-data</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -5,16 +5,14 @@
|
|||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-frontend-swt</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-frontend-swt</name>
|
||||
<description>vasc-frontend-swt</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- SWT depency TODO: linux only, wait for 3.4 !!
|
||||
<dependency>
|
||||
|
|
|
@ -10,23 +10,23 @@
|
|||
<name>vasc-frontend-web-export</name>
|
||||
<description>vasc-frontend-web-export</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -9,23 +9,23 @@
|
|||
<name>vasc-frontend-web-jsf</name>
|
||||
<description>vasc-frontend-web-jsf</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
|
@ -46,4 +46,4 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
<name>vasc-lib</name>
|
||||
<description>vasc-lib</description>
|
||||
<modules>
|
||||
<module>vasc-lib-i18n</module>
|
||||
<module>vasc-lib-jr4o</module>
|
||||
<module>vasc-lib-editor</module>
|
||||
<module>vasc-lib-i18n</module>
|
||||
<module>vasc-lib-jr4o</module>
|
||||
<module>vasc-lib-editor</module>
|
||||
</modules>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -9,4 +9,4 @@
|
|||
<artifactId>vasc-lib-editor</artifactId>
|
||||
<name>vasc-lib-editor</name>
|
||||
<description>vasc-lib-editor</description>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -9,4 +9,4 @@
|
|||
<artifactId>vasc-lib-i18n</artifactId>
|
||||
<name>vasc-lib-i18n</name>
|
||||
<description>vasc-lib-i18n</description>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -26,4 +26,4 @@
|
|||
<version>${jasperreports.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<name>vasc-test</name>
|
||||
<description>vasc-test</description>
|
||||
<modules>
|
||||
<module>vasc-test-frontend-data</module>
|
||||
<module>vasc-test-i18n</module>
|
||||
<module>vasc-test-frontend-data</module>
|
||||
<module>vasc-test-i18n</module>
|
||||
</modules>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
<name>vasc-test-frontend-data</name>
|
||||
<description>vasc-test-frontend-data</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -10,10 +10,10 @@
|
|||
<name>vasc-test-i18n</name>
|
||||
<description>vasc-test-i18n</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -5,9 +5,7 @@
|
|||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-xpql-ejb3-server</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-xpql-ejb3-server</name>
|
||||
<description>xpql parsing server impl for ejb3</description>
|
||||
<dependencies>
|
||||
|
@ -35,4 +33,4 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -5,23 +5,20 @@
|
|||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-xpql</artifactId>
|
||||
<version>0.4.1-SNAPSHOT</version>
|
||||
<name>vasc-xpql</name>
|
||||
<description>vasc xpql parser for queries.</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.x4o</groupId>
|
||||
<artifactId>x4o-core</artifactId>
|
||||
<version>${x4o.version}</version>
|
||||
</dependency>
|
||||
<!-- JSP depency -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet.jsp</groupId>
|
||||
<artifactId>jsp-api</artifactId>
|
||||
<version>${jsp-api.version}</version>
|
||||
<scope>provided</scope>
|
||||
<groupId>org.x4o</groupId>
|
||||
<artifactId>x4o-core</artifactId>
|
||||
<version>${x4o.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet.jsp</groupId>
|
||||
<artifactId>jsp-api</artifactId>
|
||||
<version>${jsp-api.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
Loading…
Reference in a new issue