Permalink
Browse files

Upgraded libraries

  • Loading branch information...
1 parent d08b7c0 commit 09a48f3003805ac4b1f209c225110442e14ba243 astefan committed Dec 20, 2012
View
@@ -8,25 +8,29 @@
<packaging>war</packaging>
<version>1.0.0-SNAPSHOT</version>
<properties>
- <spring.version>3.0.5.RELEASE</spring.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
<tiles.version>2.2.0</tiles.version>
<!-- <hsqldb.version>1.8.0.7</hsqldb.version> -->
<commons-fileupload.version>1.2.1</commons-fileupload.version>
<struts.version>1.2.9</struts.version>
<xml-rpc.version>1.1.0</xml-rpc.version>
<dbcp.version>1.2.2.osgi</dbcp.version>
- <junit.version>4.6</junit.version>
+ <junit.version>4.10</junit.version>
<commons-io.version>1.3.2</commons-io.version>
<urlrewrite.version>3.1.0</urlrewrite.version>
- <spring-js.version>2.0.7.RELEASE</spring-js.version>
+ <spring-js.version>2.3.0.RELEASE</spring-js.version>
<caucho.version>3.2.1</caucho.version>
<axis.version>1.4.0</axis.version>
<wsdl.version>1.6.1</wsdl.version>
<jstl.version>1.2</jstl.version>
- <aspectj.version>1.6.5</aspectj.version>
+ <aspectj.version>1.7.0</aspectj.version>
<servlet-api.version>2.5</servlet-api.version>
<jsp.version>2.1</jsp.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.6.6</slf4j.version>
+ <sqlfire.version>1.0.3</sqlfire.version>
+ <querydsl-maven-plugin.version>2.8.2</querydsl-maven-plugin.version>
+ <querydsl-sql.version>2.8.2</querydsl-sql.version>
+ <spring-data-jdbc.version>1.0.0.RELEASE</spring-data-jdbc.version>
</properties>
<dependencies>
<!-- Compile dependencies -->
@@ -76,8 +80,8 @@
</dependency> -->
<dependency>
<groupId>com.vmware.sqlfire</groupId>
- <artifactId>sqlfire-client</artifactId>
- <version>1.0.0-Beta</version>
+ <artifactId>sqlfireclient</artifactId>
+ <version>${sqlfire.version}</version>
</dependency>
<!-- Composite-view & layout framework -->
<dependency>
@@ -111,7 +115,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jdbc-core</artifactId>
- <version>1.0.0.M2</version>
+ <version>${spring-data-jdbc.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -132,7 +136,7 @@
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-sql</artifactId>
- <version>2.2.0</version>
+ <version>${querydsl-sql.version}</version>
</dependency>
<!-- Spring Framework Project libraries -->
@@ -268,7 +272,17 @@
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
+ <repository>
+ <id>sqlfire-release</id>
+ <url>http://dist.gemstone.com/maven/release</url>
+ </repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>sqlfire-release</id>
+ <url>http://dist.gemstone.com/maven/release</url>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<resources>
<resource>
@@ -295,7 +309,7 @@
<plugin>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-maven-plugin</artifactId>
- <version>2.2.0</version>
+ <version>${querydsl-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -306,15 +320,16 @@
<configuration>
<jdbcDriver>com.vmware.sqlfire.jdbc.ClientDriver</jdbcDriver>
<jdbcUrl>jdbc:sqlfire://localhost:1527</jdbcUrl>
+ <!-- <jdbcUrl>${sqlfire-host}:${sqlfire-port}</jdbcUrl> -->
<packageName>org.springframework.samples.jpetstore.generated.domain</packageName>
<targetFolder>${project.basedir}/src/main/java</targetFolder>
<schemaPattern>APP</schemaPattern>
</configuration>
<dependencies>
<dependency>
<groupId>com.vmware.sqlfire</groupId>
- <artifactId>sqlfire-client</artifactId>
- <version>1.0.0-Beta</version>
+ <artifactId>sqlfireclient</artifactId>
+ <version>${sqlfire.version}</version>
</dependency>
</dependencies>
</plugin>
View
@@ -61,24 +61,25 @@ service and control the start/stop commands through the Tomcat Windows service.
Also, add [Maven_dir]\bin to the PATH environment variable.
- After downloading the SQLFire jar file, place it in the folder of your choice and
-run the following command: java.exe -jar SQLFire10Beta_Installer.jar
-The installation will require to specify the directory where SQLFire will be installed
-into. In the specified directory, SQLFire will be installed, by default, in SQLFire10Beta folder.
+run the following command: java.exe -jar vFabric_SQLFire_103_Installer.jar (the sample application
+was tested with the SQLFire 1.0.3 Professional version). The installation will require to specify
+the directory where SQLFire will be installed into. In the specified directory, SQLFire will
+be installed, by default, in vFabric_SQLFire_103 folder.
- Agree with EULA license and continue with the installation.
- For the application to be able to connect to SQLFire cluster, it needs the classes and
drivers SQLFire comes bundled with. For this, SQLFire jars have to be copied to Tomcat's
-lib directory. Copy [SQLFire_DIR]\lib\gemfire.jar, [SQLFire_DIR]\lib\sqlfire.jar
-and [SQLFire_DIR]\lib\sqlfireclient.jar to [Tomcat_DIR]\lib.
+lib directory. Copy [SQLFire_DIR]\lib\sqlfire.jar and [SQLFire_DIR]\lib\sqlfireclient.jar
+to [Tomcat_DIR]\lib.
- Under the directory where SQLFire folder was installed create another two directories:
server1 and server2.
- Using sqlf command start two SQLFire server instances that should reside inside the folders
that were just created:
-sqlf server start -dir=server1 -client-port=1527 -mcast-port=12333
-sqlf server start -dir=server2 -client-port=1528 -mcast-port=12333
+sqlf server start -dir=../../server1 -client-port=1527 -mcast-port=12333
+sqlf server start -dir=../../server2 -client-port=1528 -mcast-port=12333
The unique -client-port designations indicate that each server will listen for thin client
connections on different port (1527 and 1528, respectively). This is necessary because
both servers bind to the localhost address by default. The -mcast-port option indicates
@@ -89,13 +90,15 @@ which each new SQLFire instance first connects, in order to discover the list of
peers. These instructions use multicast for server discovery.
- The data associated with the application should be loaded into SQLFire. This is accomplished
-by using the files that can be found under jpetstore\db\sqlfire.
-
-- To get the project to generate all the Querydsl query types for the tables in the database, the
-needed step is outlined in pom.xml using the querydsl-maven-plugin. Since this plugin needs
-the sqlfireclient jar, this has to be manually added to the local Maven repository:
-mvn install:install-file -DgroupId=com.vmware.sqlfire -DartifactId=sqlfire-client -Dpackaging=jar
--Dversion=1.0.0-Beta -Dfile=[sqlfireclient_jar_location] -DgeneratePom=true
+by using the files that can be found under jpetstore\db\sqlfire. Execute the following serie
+of commands, one by one using the files that can be found under [SAMPLE_APPLICATION]\db\sqlfire:
+[SQLFire_DIR]\bin>sqlf.exe
+sqlf> protocol 'jdbc:sqlfire:';
+sqlf> connect '//localhost:1527' as myConnection;
+sqlf> run '[SAMPLE_APPLICATION]\db\sqlfire\jpetstore-sqlfire-schema.sql';
+sqlf> run '[SAMPLE_APPLICATION]\db\sqlfire\jpetstore-sqlfire-dataload.sql';
+
+- Build the war file: "mvn package"
- Start the Tomcat service and, after the startup procedure has finished, copy the application
war file created earlier to [Tomcat_DIR]\webapps. After the deployment has finished, open up
@@ -2,19 +2,18 @@
import static com.mysema.query.types.PathMetadataFactory.*;
-import com.mysema.query.types.*;
import com.mysema.query.types.path.*;
-import com.mysema.query.sql.*;
-import java.util.*;
+import com.mysema.query.types.PathMetadata;
+import javax.annotation.Generated;
+import com.mysema.query.types.Path;
/**
* QAccount is a Querydsl query type for QAccount
*/
-@Table("ACCOUNT")
-@Schema("APP")
-public class QAccount extends RelationalPathBase<QAccount> {
+@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
+public class QAccount extends com.mysema.query.sql.RelationalPathBase<QAccount> {
private static final long serialVersionUID = 2061303545;
@@ -44,18 +43,19 @@
public final StringPath zip = createString("ZIP");
- public final PrimaryKey<QAccount> accountPk = createPrimaryKey(userid);
+ public final com.mysema.query.sql.PrimaryKey<QAccount> accountPk = createPrimaryKey(userid);
public QAccount(String variable) {
- super(QAccount.class, forVariable(variable));
+ super(QAccount.class, forVariable(variable), "APP", "ACCOUNT");
}
- public QAccount(BeanPath<? extends QAccount> entity) {
- super(entity.getType(), entity.getMetadata());
+ @SuppressWarnings("all")
+ public QAccount(Path<? extends QAccount> path) {
+ super((Class)path.getType(), path.getMetadata(), "APP", "ACCOUNT");
}
public QAccount(PathMetadata<?> metadata) {
- super(QAccount.class, metadata);
+ super(QAccount.class, metadata, "APP", "ACCOUNT");
}
}
@@ -2,19 +2,18 @@
import static com.mysema.query.types.PathMetadataFactory.*;
-import com.mysema.query.types.*;
import com.mysema.query.types.path.*;
-import com.mysema.query.sql.*;
-import java.util.*;
+import com.mysema.query.types.PathMetadata;
+import javax.annotation.Generated;
+import com.mysema.query.types.Path;
/**
* QBannerdata is a Querydsl query type for QBannerdata
*/
-@Table("BANNERDATA")
-@Schema("APP")
-public class QBannerdata extends RelationalPathBase<QBannerdata> {
+@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
+public class QBannerdata extends com.mysema.query.sql.RelationalPathBase<QBannerdata> {
private static final long serialVersionUID = -1376272246;
@@ -24,18 +23,19 @@
public final StringPath favcategory = createString("FAVCATEGORY");
- public final PrimaryKey<QBannerdata> bannerdataPk = createPrimaryKey(favcategory);
+ public final com.mysema.query.sql.PrimaryKey<QBannerdata> bannerdataPk = createPrimaryKey(favcategory);
public QBannerdata(String variable) {
- super(QBannerdata.class, forVariable(variable));
+ super(QBannerdata.class, forVariable(variable), "APP", "BANNERDATA");
}
- public QBannerdata(BeanPath<? extends QBannerdata> entity) {
- super(entity.getType(), entity.getMetadata());
+ @SuppressWarnings("all")
+ public QBannerdata(Path<? extends QBannerdata> path) {
+ super((Class)path.getType(), path.getMetadata(), "APP", "BANNERDATA");
}
public QBannerdata(PathMetadata<?> metadata) {
- super(QBannerdata.class, metadata);
+ super(QBannerdata.class, metadata, "APP", "BANNERDATA");
}
}
@@ -2,19 +2,18 @@
import static com.mysema.query.types.PathMetadataFactory.*;
-import com.mysema.query.types.*;
import com.mysema.query.types.path.*;
-import com.mysema.query.sql.*;
-import java.util.*;
+import com.mysema.query.types.PathMetadata;
+import javax.annotation.Generated;
+import com.mysema.query.types.Path;
/**
* QCategory is a Querydsl query type for QCategory
*/
-@Table("CATEGORY")
-@Schema("APP")
-public class QCategory extends RelationalPathBase<QCategory> {
+@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
+public class QCategory extends com.mysema.query.sql.RelationalPathBase<QCategory> {
private static final long serialVersionUID = 1663558066;
@@ -26,20 +25,21 @@
public final StringPath name = createString("NAME");
- public final PrimaryKey<QCategory> categoryPk = createPrimaryKey(catid);
+ public final com.mysema.query.sql.PrimaryKey<QCategory> categoryPk = createPrimaryKey(catid);
- public final ForeignKey<QProduct> _productcatFk = createInvForeignKey(catid, "CATEGORY");
+ public final com.mysema.query.sql.ForeignKey<QProduct> _productcatFk = createInvForeignKey(catid, "CATEGORY");
public QCategory(String variable) {
- super(QCategory.class, forVariable(variable));
+ super(QCategory.class, forVariable(variable), "APP", "CATEGORY");
}
- public QCategory(BeanPath<? extends QCategory> entity) {
- super(entity.getType(), entity.getMetadata());
+ @SuppressWarnings("all")
+ public QCategory(Path<? extends QCategory> path) {
+ super((Class)path.getType(), path.getMetadata(), "APP", "CATEGORY");
}
public QCategory(PathMetadata<?> metadata) {
- super(QCategory.class, metadata);
+ super(QCategory.class, metadata, "APP", "CATEGORY");
}
}
@@ -2,19 +2,18 @@
import static com.mysema.query.types.PathMetadataFactory.*;
-import com.mysema.query.types.*;
import com.mysema.query.types.path.*;
-import com.mysema.query.sql.*;
-import java.util.*;
+import com.mysema.query.types.PathMetadata;
+import javax.annotation.Generated;
+import com.mysema.query.types.Path;
/**
* QInventory is a Querydsl query type for QInventory
*/
-@Table("INVENTORY")
-@Schema("APP")
-public class QInventory extends RelationalPathBase<QInventory> {
+@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
+public class QInventory extends com.mysema.query.sql.RelationalPathBase<QInventory> {
private static final long serialVersionUID = 739216168;
@@ -24,18 +23,19 @@
public final NumberPath<Integer> qty = createNumber("QTY", Integer.class);
- public final PrimaryKey<QInventory> inventoryPk = createPrimaryKey(itemid);
+ public final com.mysema.query.sql.PrimaryKey<QInventory> inventoryPk = createPrimaryKey(itemid);
public QInventory(String variable) {
- super(QInventory.class, forVariable(variable));
+ super(QInventory.class, forVariable(variable), "APP", "INVENTORY");
}
- public QInventory(BeanPath<? extends QInventory> entity) {
- super(entity.getType(), entity.getMetadata());
+ @SuppressWarnings("all")
+ public QInventory(Path<? extends QInventory> path) {
+ super((Class)path.getType(), path.getMetadata(), "APP", "INVENTORY");
}
public QInventory(PathMetadata<?> metadata) {
- super(QInventory.class, metadata);
+ super(QInventory.class, metadata, "APP", "INVENTORY");
}
}
Oops, something went wrong.

0 comments on commit 09a48f3

Please sign in to comment.