[wsas-java-dev] svn commit r13620 - in branches/wsas/java/2.2:
commons/adminui commons/adminui/core commons/adminui/www
commons/archive-validators commons/codegen
commons/data-services commons/deployers/axis1deployer
commons/dynamic-codegen commons/mex commons/plugins/js-plugin
commons/plugins/sm-list-plugin commons/sandesha2-persistence
commons/sandesha2-persistence/modules/core
commons/sandesha2-persistence/modules/mar commons/statistics
commons/statistics/modules/client
commons/statistics/modules/core commons/throttle
commons/throttle/modules/core commons/throttle/modules/mar
commons/tracer commons/utils commons/wsdl-converter
commons/wsdl-view commons/xfer commons/xfer/modules/core
commons/xfer/modules/samples commons/xkms wsas/java
wsas/java/modules/admin wsas/java/modules/clustering
wsas/java/modules/core wsas/java/modules/core/conf/hibernate
wsas/java/modules/core/lib/hibernate
wsas/java/modules/core/src/org/wso2/wsas/persistence
wsas/java/modules/core/src/org/wso2/wsas/persistence/dao
wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject
wsas/java/modules/core/src/org/wso2/wsas/util
wsas/java/modules/core/test-resources
wsas/java/modules/core/test/org/wso2/wsas/persistence
wsas/java/modules/distribution
wsas/java/modules/distribution/resources
wsas/java/modules/documentation
wsas/java/modules/documentation/src/site/xdoc
wsas/java/modules/integration wsas/java/modules/samples
wsas/java/modules/samples/Chad
wsas/java/modules/samples/Chad/conf/hibernate
wsas/java/modules/samples/CommodityQuote
wsas/java/modules/samples/DataService
wsas/java/modules/samples/EJBService
wsas/java/modules/samples/FlickrClient
wsas/java/modules/samples/JAXWS
wsas/java/modules/samples/JavascriptService
wsas/java/modules/samples/Jibx wsas/java/modules/samples/MEX
wsas/java/modules/samples/MTOM
wsas/java/modules/samples/NodeManagement
wsas/java/modules/samples/TinyURL wsas/java/modules/samples/Trader
wsas/java/modules/samples/XKMS wsas/java/modules/samples/Xfer
wsas/java/modules/samples/sts-sample wsas/java/modules/sts
wsas/java/modules/www wsf/java/modules/eclipse-wtp-plugins
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.consumption.core
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.consumption.ui
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.core
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.creation.core
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.creation.ui
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.server.wsas
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.ui
wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.wtp.ext
wsf/javascript/native
svn at wso2.org
svn at wso2.org
Tue Feb 12 00:13:19 PST 2008
Author: azeez
Date: Tue Feb 12 00:11:07 2008
New Revision: 13620
Log:
Preparing for WSAS 2.2.1 release
Modified:
branches/wsas/java/2.2/commons/adminui/core/pom.xml
branches/wsas/java/2.2/commons/adminui/pom.xml
branches/wsas/java/2.2/commons/adminui/www/pom.xml
branches/wsas/java/2.2/commons/archive-validators/pom.xml
branches/wsas/java/2.2/commons/codegen/pom.xml
branches/wsas/java/2.2/commons/data-services/pom.xml
branches/wsas/java/2.2/commons/deployers/axis1deployer/pom.xml
branches/wsas/java/2.2/commons/dynamic-codegen/pom.xml
branches/wsas/java/2.2/commons/mex/pom.xml
branches/wsas/java/2.2/commons/plugins/js-plugin/pom.xml
branches/wsas/java/2.2/commons/plugins/sm-list-plugin/pom.xml
branches/wsas/java/2.2/commons/sandesha2-persistence/modules/core/pom.xml
branches/wsas/java/2.2/commons/sandesha2-persistence/modules/mar/pom.xml
branches/wsas/java/2.2/commons/sandesha2-persistence/pom.xml
branches/wsas/java/2.2/commons/statistics/modules/client/pom.xml
branches/wsas/java/2.2/commons/statistics/modules/core/pom.xml
branches/wsas/java/2.2/commons/statistics/pom.xml
branches/wsas/java/2.2/commons/throttle/modules/core/pom.xml
branches/wsas/java/2.2/commons/throttle/modules/mar/pom.xml
branches/wsas/java/2.2/commons/throttle/pom.xml
branches/wsas/java/2.2/commons/tracer/pom.xml
branches/wsas/java/2.2/commons/utils/pom.xml
branches/wsas/java/2.2/commons/wsdl-converter/pom.xml
branches/wsas/java/2.2/commons/wsdl-view/pom.xml
branches/wsas/java/2.2/commons/xfer/modules/core/pom.xml
branches/wsas/java/2.2/commons/xfer/modules/samples/pom.xml
branches/wsas/java/2.2/commons/xfer/pom.xml
branches/wsas/java/2.2/commons/xkms/pom.xml
branches/wsas/java/2.2/wsas/java/README
branches/wsas/java/2.2/wsas/java/modules/admin/pom.xml
branches/wsas/java/2.2/wsas/java/modules/clustering/pom.xml
branches/wsas/java/2.2/wsas/java/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml
branches/wsas/java/2.2/wsas/java/modules/core/lib/hibernate/wso2wsas.hibernate.cfg.xml
branches/wsas/java/2.2/wsas/java/modules/core/pom.xml
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/AppenderDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/BaseDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityTokenDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/util/HibernateConfig.java
branches/wsas/java/2.2/wsas/java/modules/core/test-resources/wso2wsas.hibernate.cfg.xml
branches/wsas/java/2.2/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java
branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml
branches/wsas/java/2.2/wsas/java/modules/distribution/resources/hibernate.properties
branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml
branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/installation_guide.xml
branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/release_notes.xml
branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/Chad/conf/hibernate/chad.hibernate.cfg.xml
branches/wsas/java/2.2/wsas/java/modules/samples/Chad/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/CommodityQuote/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/DataService/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/EJBService/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/FlickrClient/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/JAXWS/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/JavascriptService/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/Jibx/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/MEX/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/MTOM/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/NodeManagement/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/TinyURL/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/Trader/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/XKMS/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/Xfer/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/pom.xml
branches/wsas/java/2.2/wsas/java/modules/samples/sts-sample/pom.xml
branches/wsas/java/2.2/wsas/java/modules/sts/pom.xml
branches/wsas/java/2.2/wsas/java/modules/www/pom.xml
branches/wsas/java/2.2/wsas/java/pom.xml
branches/wsas/java/2.2/wsas/java/release-notes.html
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.consumption.core/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.consumption.ui/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.core/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.creation.core/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.creation.ui/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.server.wsas/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.ui/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/org.wso2.wsf.ide.wtp.ext/pom.xml
branches/wsas/java/2.2/wsf/java/modules/eclipse-wtp-plugins/pom.xml
branches/wsas/java/2.2/wsf/javascript/native/pom.xml
Modified: branches/wsas/java/2.2/commons/adminui/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/adminui/core/pom.xml (original)
+++ branches/wsas/java/2.2/commons/adminui/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,14 +5,14 @@
<parent>
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2adminui-parent</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2adminui</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2adminui</name>
<url>http://maven.apache.org</url>
Modified: branches/wsas/java/2.2/commons/adminui/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/adminui/pom.xml (original)
+++ branches/wsas/java/2.2/commons/adminui/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2adminui-parent</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2adminui-parent</name>
<url>http://maven.apache.org</url>
@@ -189,7 +189,7 @@
<axiom.version>1.2.6</axiom.version>
<commons.logging.version>1.1</commons.logging.version>
<servletapi.version>2.3</servletapi.version>
- <wso2utils.version>2.2</wso2utils.version>
+ <wso2utils.version>2.2.1</wso2utils.version>
</properties>
<modules>
Modified: branches/wsas/java/2.2/commons/adminui/www/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/adminui/www/pom.xml (original)
+++ branches/wsas/java/2.2/commons/adminui/www/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2adminui-www</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2adminui-www</name>
<url>http://maven.apache.org</url>
Modified: branches/wsas/java/2.2/commons/archive-validators/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/archive-validators/pom.xml (original)
+++ branches/wsas/java/2.2/commons/archive-validators/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.validator</groupId>
<artifactId>archive-validator</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>Axis2 AAR/MAR/module.xml or services.xml validator</name>
<url>http://www.wso2.com</url>
Modified: branches/wsas/java/2.2/commons/codegen/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/codegen/pom.xml (original)
+++ branches/wsas/java/2.2/commons/codegen/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.codegen</groupId>
<artifactId>wso2codegen</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2codegen</name>
<url>http://www.wso2.org</url>
Modified: branches/wsas/java/2.2/commons/data-services/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/data-services/pom.xml (original)
+++ branches/wsas/java/2.2/commons/data-services/pom.xml Tue Feb 12 00:11:07 2008
@@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.dataservice</groupId>
<artifactId>wso2data-service</artifactId>
- <packaging>jar</packaging>
- <version>2.2</version>
+ <packaging>jar</packaging>
+ <version>2.2.1</version>
<name>WSO2 Data Service</name>
<url>http://wso2.org</url>
<description>WSO2 Data Services</description>
Modified: branches/wsas/java/2.2/commons/deployers/axis1deployer/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/deployers/axis1deployer/pom.xml (original)
+++ branches/wsas/java/2.2/commons/deployers/axis1deployer/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.a1deployer</groupId>
<artifactId>wso2a1deployer</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>Axis1 Deployer for Axis2</name>
<url>http://wso2.org</url>
Modified: branches/wsas/java/2.2/commons/dynamic-codegen/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/dynamic-codegen/pom.xml (original)
+++ branches/wsas/java/2.2/commons/dynamic-codegen/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<groupId>org.wso2.dynamiccodegen</groupId>
<artifactId>wso2dynamic-codegen</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 Dynamic Codegen</name>
<url>http://wso2.org</url>
Modified: branches/wsas/java/2.2/commons/mex/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/mex/pom.xml (original)
+++ branches/wsas/java/2.2/commons/mex/pom.xml Tue Feb 12 00:11:07 2008
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2mex</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 - Mex Module</name>
<dependencies>
Modified: branches/wsas/java/2.2/commons/plugins/js-plugin/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/plugins/js-plugin/pom.xml (original)
+++ branches/wsas/java/2.2/commons/plugins/js-plugin/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>js-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>js-plugin Maven Mojo</name>
<url>http://www.wso2.com</url>
<dependencies>
Modified: branches/wsas/java/2.2/commons/plugins/sm-list-plugin/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/plugins/sm-list-plugin/pom.xml (original)
+++ branches/wsas/java/2.2/commons/plugins/sm-list-plugin/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>sm-list-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>sm-list-plugin Maven Mojo</name>
<url>http://www.wso2.com</url>
<dependencies>
Modified: branches/wsas/java/2.2/commons/sandesha2-persistence/modules/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/sandesha2-persistence/modules/core/pom.xml (original)
+++ branches/wsas/java/2.2/commons/sandesha2-persistence/modules/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.sandesha2</groupId>
<artifactId>wso2sandesha2-parent</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/commons/sandesha2-persistence/modules/mar/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/sandesha2-persistence/modules/mar/pom.xml (original)
+++ branches/wsas/java/2.2/commons/sandesha2-persistence/modules/mar/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.sandesha2</groupId>
<artifactId>wso2sandesha2-parent</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/commons/sandesha2-persistence/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/sandesha2-persistence/pom.xml (original)
+++ branches/wsas/java/2.2/commons/sandesha2-persistence/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.sandesha2</groupId>
<artifactId>wso2sandesha2-parent</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>Persistence plugin for sandesha2</name>
<url>http://wso2.org</url>
<inceptionYear>2007</inceptionYear>
Modified: branches/wsas/java/2.2/commons/statistics/modules/client/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/statistics/modules/client/pom.xml (original)
+++ branches/wsas/java/2.2/commons/statistics/modules/client/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics-parent</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/commons/statistics/modules/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/statistics/modules/core/pom.xml (original)
+++ branches/wsas/java/2.2/commons/statistics/modules/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2statistics</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 Statistics module</name>
<build>
Modified: branches/wsas/java/2.2/commons/statistics/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/statistics/pom.xml (original)
+++ branches/wsas/java/2.2/commons/statistics/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics-parent</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 Statistics module</name>
<url>http://maven.apache.org</url>
Modified: branches/wsas/java/2.2/commons/throttle/modules/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/throttle/modules/core/pom.xml (original)
+++ branches/wsas/java/2.2/commons/throttle/modules/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2throttle-core</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 Throttling module - core</name>
<build>
<plugins>
Modified: branches/wsas/java/2.2/commons/throttle/modules/mar/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/throttle/modules/mar/pom.xml (original)
+++ branches/wsas/java/2.2/commons/throttle/modules/mar/pom.xml Tue Feb 12 00:11:07 2008
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2throttle</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 Throttling module - Mar</name>
<build>
Modified: branches/wsas/java/2.2/commons/throttle/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/throttle/pom.xml (original)
+++ branches/wsas/java/2.2/commons/throttle/pom.xml Tue Feb 12 00:11:07 2008
@@ -6,7 +6,7 @@
<groupId>org.wso2.throttle</groupId>
<artifactId>wso2throttle-parent</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 throttle module</name>
<url>http://www.wso2.org</url>
Modified: branches/wsas/java/2.2/commons/tracer/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/tracer/pom.xml (original)
+++ branches/wsas/java/2.2/commons/tracer/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.tracer</groupId>
<artifactId>wso2tracer</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2tracer</name>
<url>http://maven.apache.org</url>
Modified: branches/wsas/java/2.2/commons/utils/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/utils/pom.xml (original)
+++ branches/wsas/java/2.2/commons/utils/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.utils</groupId>
<artifactId>wso2utils</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>wso2utils</name>
<url>http://maven.apache.org</url>
<dependencies>
Modified: branches/wsas/java/2.2/commons/wsdl-converter/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/wsdl-converter/pom.xml (original)
+++ branches/wsas/java/2.2/commons/wsdl-converter/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.wsdlconverter</groupId>
<artifactId>wsdlconverter</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 WSDL Converter</name>
<url>http://www.wso2.com</url>
Modified: branches/wsas/java/2.2/commons/wsdl-view/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/wsdl-view/pom.xml (original)
+++ branches/wsas/java/2.2/commons/wsdl-view/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.wsdlview</groupId>
<artifactId>wsdlview</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 WSDL View</name>
<url>http://www.wso2.com</url>
Modified: branches/wsas/java/2.2/commons/xfer/modules/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/xfer/modules/core/pom.xml (original)
+++ branches/wsas/java/2.2/commons/xfer/modules/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2xfer</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 WS-Transfer Module - Core</name>
<build>
Modified: branches/wsas/java/2.2/commons/xfer/modules/samples/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/xfer/modules/samples/pom.xml (original)
+++ branches/wsas/java/2.2/commons/xfer/modules/samples/pom.xml Tue Feb 12 00:11:07 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.wso2.xfer</groupId>
<artifactId>wso2xfer-parent</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/commons/xfer/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/xfer/pom.xml (original)
+++ branches/wsas/java/2.2/commons/xfer/pom.xml Tue Feb 12 00:11:07 2008
@@ -6,7 +6,7 @@
<groupId>org.wso2.xfer</groupId>
<artifactId>wso2xfer-parent</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>WSO2 WS-Transfer Module</name>
<url>http://www.wso2.org</url>
Modified: branches/wsas/java/2.2/commons/xkms/pom.xml
==============================================================================
--- branches/wsas/java/2.2/commons/xkms/pom.xml (original)
+++ branches/wsas/java/2.2/commons/xkms/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<groupId>org.wso2.xkms</groupId>
<artifactId>xkms</artifactId>
<packaging>jar</packaging>
- <version>2.2</version>
+ <version>2.2.1</version>
<name>XML Key Management Specification (XKMS)</name>
<url>http://wso2.org</url>
Modified: branches/wsas/java/2.2/wsas/java/README
==============================================================================
--- branches/wsas/java/2.2/wsas/java/README (original)
+++ branches/wsas/java/2.2/wsas/java/README Tue Feb 12 00:11:07 2008
@@ -1,4 +1,4 @@
-22nd January 2008
+12th February 2008
WSO2 Web Services Application Server v at wso2wsas_version@
-------------------------------------------
Modified: branches/wsas/java/2.2/wsas/java/modules/admin/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/admin/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/admin/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/clustering/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/clustering/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/clustering/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/conf/hibernate/wso2wsas.hibernate.cfg.xml Tue Feb 12 00:11:07 2008
@@ -39,7 +39,13 @@
<!-- Posible values for hbm2ddl.auto (update | create | create-drop)-->
<!--<property name="hbm2ddl.auto">create</property>-->
+
+ <!-- Enable Hibernate's automatic session context management -->
+ <property name="current_session_context_class">thread</property>
+ <property name="hibernate.transaction.flush_before_completion">true</property>
+
+ <property name="hibernate.transaction.auto_close_session">true</property>
<mapping resource="wso2wsas.hbm.xml"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/core/lib/hibernate/wso2wsas.hibernate.cfg.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/lib/hibernate/wso2wsas.hibernate.cfg.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/lib/hibernate/wso2wsas.hibernate.cfg.xml Tue Feb 12 00:11:07 2008
@@ -28,6 +28,9 @@
<property name="connection.pool_size">1</property>
<property name="dialect">org.hibernate.dialect.DerbyDialect</property>
<property name="show_sql">false</property>
+ <property name="current_session_context_class">thread</property>
+ <property name="hibernate.transaction.flush_before_completion">true</property>
+ <property name="hibernate.transaction.auto_close_session">true</property>
<mapping resource="wso2wsas.hbm.xml"/>
<!--
@@ -41,6 +44,9 @@
<property name="connection.pool_size">1</property>
<property name="dialect">org.hibernate.dialect.DerbyDialect</property>
<property name="show_sql">false</property>
+ <property name="current_session_context_class">thread</property>
+ <property name="hibernate.transaction.flush_before_completion">true</property>
+ <property name="hibernate.transaction.auto_close_session">true</property>
<mapping resource="wso2wsas.hbm.xml"/>
-->
</session-factory>
Modified: branches/wsas/java/2.2/wsas/java/modules/core/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java Tue Feb 12 00:11:07 2008
@@ -765,16 +765,11 @@
serviceDO.addTransport(transportDO);
}
}
-
- session.flush();
tx.commit();
} catch (Exception e) {
log.error("Unable to handle new service addition", e);
- session.flush();
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
}
}
@@ -1050,9 +1045,7 @@
log.error("Unable to handle service initialization", e);
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
- }
+ }
}
private boolean isGloballyEngaged(String moduleId, String moduleVersion, Session session) {
@@ -1128,8 +1121,6 @@
log.error("Unable to handle service group init", e);
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
}
}
@@ -1176,16 +1167,12 @@
}
}
new ServiceGroupDAO(hbConfig).createServiceGroup(sgDO, session);
- session.flush();
tx.commit();
} catch (Exception e) {
log.error("Unable to handle new service group addition", e);
- session.flush();
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
- }
+ }
if (log.isDebugEnabled()) {
log.debug("Added new service group - " + sgName);
}
@@ -1222,7 +1209,6 @@
for (int i = 0; i < modulePolicies.length; i++) {
moduleDO.addPolicy(modulePolicies[i]);
}
- session.flush();
tx.commit();
if (log.isDebugEnabled()) {
log.debug("Added new module - " + axisModule.getName() + "-" + axisModule.getVersion());
@@ -1230,11 +1216,8 @@
} catch (Exception e) {
log.error("Unable to handle new module addition", e);
markFaultyModule(axisModule);
- session.flush();
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
}
}
@@ -1298,8 +1281,6 @@
markFaultyModule(axisModule);
tx.rollback();
throw e;
- } finally {
- hbConfig.closeSession();
}
}
@@ -1386,9 +1367,7 @@
String msg = "Unable to removeAllLoggersAndAppenders";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
public Long addEJBConfiguration(EJBProviderDO ejbProvider)
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/AppenderDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/AppenderDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/AppenderDAO.java Tue Feb 12 00:11:07 2008
@@ -52,8 +52,6 @@
String msg = "Unable to getAppenderDO";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return appeanderDO;
}
@@ -91,8 +89,6 @@
String msg = "Unable to updateAppenderDO";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -113,8 +109,6 @@
String msg = "Unable to addLogger";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -137,8 +131,6 @@
String msg = "Unable to getLoggers";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return loggers;
}
@@ -156,8 +148,6 @@
String msg = "Unable to getAllAppenders";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return appenders;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/BaseDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/BaseDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/BaseDAO.java Tue Feb 12 00:11:07 2008
@@ -54,20 +54,17 @@
try {
trasientInstance.setLastUpdatedTime(new Date());
session.persist(trasientInstance);
- session.flush();
tx.commit();
} catch (ConstraintViolationException e) {
String msg = "Trying to create duplicate entity";
+ tx.rollback();
log.warn(msg, e);
throw new DuplicateEntityException(msg, e);
} catch (Exception e) {
e.printStackTrace();
tx.rollback();
throw new RuntimeException("Cannot create entity", e);
- } finally {
- hbConfig.closeSession();
}
-
return trasientInstance.getId();
}
@@ -77,20 +74,17 @@
try {
instance.setLastUpdatedTime(new Date());
session.saveOrUpdate(instance);
- session.flush();
tx.commit();
} catch (ConstraintViolationException e) {
String msg = "Trying to create duplicate entity";
+ tx.rollback();
log.warn(msg, e);
throw new DuplicateEntityException(msg, e);
} catch (Exception e) {
e.printStackTrace();
tx.rollback();
throw new RuntimeException("Cannot create entity", e);
- } finally {
- hbConfig.closeSession();
}
-
return instance.getId();
}
@@ -100,16 +94,13 @@
try {
abstractDO.setLastUpdatedTime(new Date());
session.merge(abstractDO);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to update";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
public void delete(AbstractDataObject abstractDO) {
@@ -117,15 +108,12 @@
Transaction tx = session.beginTransaction();
try {
session.delete(abstractDO);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to delete";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBAppServerDAO.java Tue Feb 12 00:11:07 2008
@@ -53,9 +53,7 @@
String msg = "Unable to save EJB Application Server";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
public EJBAppServerDO[] getEJBAppServers() {
@@ -66,16 +64,13 @@
Criteria ejbProviderCriteria = session.createCriteria(EJBAppServerDO.class);
List list = ejbProviderCriteria.list();
ejbAppServers = (EJBAppServerDO[]) list.toArray(new EJBAppServerDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to retrieve all ejb application servers";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return ejbAppServers;
}
@@ -92,7 +87,6 @@
return;
}
session.delete(ejbAppServerDO);
- session.flush();
tx.commit();
} catch (Throwable e) {
e.printStackTrace();
@@ -100,8 +94,6 @@
String msg = "Unable to delete EJB Application Server";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -125,9 +117,7 @@
String msg = "Unable to retrieve EJB Configuration";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return ejbAppServerDO;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/EJBConfigurationDAO.java Tue Feb 12 00:11:07 2008
@@ -49,8 +49,6 @@
String msg = "Unable to add EJB Configuration";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -63,16 +61,13 @@
Criteria ejbProviderCriteria = session.createCriteria(EJBProviderDO.class);
List list = ejbProviderCriteria.list();
ejbProviders = (EJBProviderDO[]) list.toArray(new EJBProviderDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to retrieve all ejb provider configurations";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return ejbProviders;
}
@@ -90,7 +85,6 @@
return;
}
session.delete(ejbProviderDO);
- session.flush();
tx.commit();
} catch (Throwable e) {
e.printStackTrace();
@@ -98,8 +92,6 @@
String msg = "Unable to delete EJB Configuration";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -132,9 +124,7 @@
log.error(msg, e);
throw new RuntimeException(msg, e);
}
- } finally {
- hbConfig.closeSession();
- }
+ }
return ejbProviderDO;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java Tue Feb 12 00:11:07 2008
@@ -43,16 +43,13 @@
try {
List list = session.createQuery(query).list();
keystores = (KeyStoreDO[]) list.toArray(new KeyStoreDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
- String msg = "Unable to get transport keystores";
+ String msg = "Unable to getKeystores";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return keystores;
}
@@ -60,7 +57,7 @@
String userQuery = "from KeyStoreDO where keyStoreName='" + ksName.trim() + "'";
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- KeyStoreDO keyStore = null;
+ KeyStoreDO keyStore;
try {
keyStore = (KeyStoreDO) session.createQuery(userQuery).uniqueResult();
tx.commit();
@@ -69,8 +66,6 @@
String msg = "Unable to getKeyStore";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return keyStore;
}
@@ -86,15 +81,12 @@
return;
}
session.delete(ksDO);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to delete keystore";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java Tue Feb 12 00:11:07 2008
@@ -48,8 +48,6 @@
String msg = "Unable to get logger";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return loggerDO;
}
@@ -75,9 +73,7 @@
String msg = "Unable to update logger";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
public List getAllLoggers() {
@@ -93,8 +89,6 @@
String msg = "Unable to get all loggers";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return loggers;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java Tue Feb 12 00:11:07 2008
@@ -53,7 +53,6 @@
long maxSeq = -1;
try {
Object msg = session.createQuery(query).uniqueResult();
- System.out.println("####### MAX SEQ MSG=" + msg);
Long seq = (Long) msg;
if (seq != null) {
maxSeq = seq.longValue();
@@ -64,8 +63,6 @@
String msg = "Unable to getMaxMessageSequence";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return maxSeq;
}
@@ -115,8 +112,6 @@
String msg = "Unable to addMessage";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -152,9 +147,7 @@
String msg = "Unable to getMessages";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
private ServiceDO getService(String serviceId, String version, Session session) {
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java Tue Feb 12 00:11:07 2008
@@ -56,9 +56,7 @@
String msg = "Unable to getModule";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return moduleDO;
}
@@ -99,9 +97,6 @@
String msg = "Unable to deleteModule";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
@@ -123,9 +118,6 @@
String msg = "Unable to addEngagedService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
@@ -149,9 +141,6 @@
String msg = "Unable to removeEngagedService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
@@ -174,9 +163,6 @@
String msg = "Unable to addEngagedServiceGroup";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
@@ -185,7 +171,7 @@
ServiceGroupDO serviceGrp) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ModuleDO moduleDO = null;
+ ModuleDO moduleDO;
try {
moduleDO = getModule(moduleName, version, session);
if (moduleDO != null) {
@@ -203,17 +189,14 @@
String msg = "Unable to removeEngagedService group";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
public ServiceDO[] getEngagedServices(String moduleName, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ModuleDO moduleDO = null;
- ServiceDO[] serviceDOs = null;
+ ModuleDO moduleDO;
+ ServiceDO[] serviceDOs;
try {
moduleDO = getModule(moduleName, version, session);
Set engServiceSet = moduleDO.getEngagedServices();
@@ -224,9 +207,6 @@
String msg = "Unable to getEngagedServices";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
return serviceDOs;
}
@@ -248,9 +228,6 @@
String msg = "Unable to getEngagedServices";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
return serviceGroupDOs;
}
@@ -273,8 +250,6 @@
String msg = "Unable to addEngagedOperation";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -302,9 +277,6 @@
String msg = "Unable to removeEngagedOperation";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(moduleDO);
- hbConfig.closeSession();
}
}
@@ -322,8 +294,6 @@
String msg = "Unable to addPolicy";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -342,8 +312,6 @@
String msg = "Unable to getEngagedOperations";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return opDOs;
}
@@ -363,8 +331,6 @@
String msg = "Unable to getPolicies";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return policies;
}
@@ -384,8 +350,6 @@
String msg = "Unable to getPolicies";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return policies;
}
@@ -418,8 +382,6 @@
String msg = "Unable to updatePolicy";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -437,8 +399,6 @@
String msg = "Unable to addParameter";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -457,8 +417,6 @@
String msg = "Unable to getParameters";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return params;
}
@@ -467,7 +425,7 @@
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
ModuleDO moduleDO;
- ModuleParameterDO[] params = null;
+ ModuleParameterDO[] params;
try {
moduleDO = (ModuleDO) session.load(ModuleDO.class, module.getId());
Set paramSet = moduleDO.getParameters();
@@ -478,8 +436,6 @@
String msg = "Unable to getParameters";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return params;
}
@@ -493,8 +449,7 @@
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ModuleParameterDO paramDO = null;
+ ModuleParameterDO paramDO;
try {
paramDO = (ModuleParameterDO) session.createQuery(query).uniqueResult();
tx.commit();
@@ -503,9 +458,6 @@
String msg = "Unable to getParameter";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return paramDO;
}
@@ -542,9 +494,7 @@
String msg = "Unable to getAllModules";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return modules;
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java Tue Feb 12 00:11:07 2008
@@ -53,10 +53,10 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Cannot get service identifier";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
-
return serviceId;
}
@@ -66,15 +66,12 @@
try {
operation.setLastUpdatedTime(new Date());
session.merge(operation);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
- String msg = "Unable to update service";
+ String msg = "Unable to update operation";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -89,8 +86,9 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Cannot getEngagedModules";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return modules;
@@ -106,10 +104,11 @@
params =
(OperationParameterDO[]) paramSet.toArray(new OperationParameterDO[paramSet.size()]);
tx.commit();
- } catch (Exception e) {
+ } catch (Throwable e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Cannot getParameters";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return params;
@@ -121,16 +120,16 @@
serviceVersion.trim() + "' and op.name='" + opName.trim() + "'";
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- OperationDO op = null;
+ OperationDO op;
try {
op = (OperationDO) session.createQuery(query).uniqueResult();
tx.commit();
- } catch (Exception e) {
+ } catch (Throwable e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Cannot getOperation";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
-
return op;
}
@@ -149,10 +148,11 @@
break;
}
}
- } catch (Exception e) {
+ } catch (Throwable e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Cannot getOperationParameter";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return opParamDO;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java Tue Feb 12 00:11:07 2008
@@ -40,19 +40,17 @@
public SecurityScenarioDO[] getAllScenarios() {
Session session = hbConfig.currentSession();
- Transaction transaction = session.beginTransaction();
+ Transaction tx = session.beginTransaction();
List scenarios = new ArrayList();
try {
Criteria criteria = session.createCriteria(SecurityScenarioDO.class);
scenarios = criteria.list();
- transaction.commit();
+ tx.commit();
} catch (Throwable e) {
- transaction.rollback();
+ tx.rollback();
String msg = "Unable to get all scenarios";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return (SecurityScenarioDO[]) scenarios.
toArray(new SecurityScenarioDO[scenarios.size()]);
@@ -60,21 +58,19 @@
public SecurityScenarioDO getSecurityScenario(String scenarioId) {
Session session = hbConfig.currentSession();
- Transaction transaction = session.beginTransaction();
+ Transaction tx = session.beginTransaction();
SecurityScenarioDO scenario = null;
try {
Criteria criteria = session.createCriteria(SecurityScenarioDO.class);
criteria.add(Expression.eq("scenarioId", scenarioId.trim()));
scenario = (SecurityScenarioDO) criteria.uniqueResult();
- transaction.commit();
+ tx.commit();
} catch (Throwable e) {
- transaction.rollback();
+ tx.rollback();
String msg = "Unable to get all scenarios";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return scenario;
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityTokenDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityTokenDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityTokenDAO.java Tue Feb 12 00:11:07 2008
@@ -51,9 +51,7 @@
String msg = "Unable to get Token";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return token;
}
@@ -65,15 +63,12 @@
Criteria criteria = session.createCriteria(SecurityTokenDO.class);
List list = criteria.list();
tokens = (SecurityTokenDO[]) list.toArray(new SecurityTokenDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to get all Tokens";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return tokens;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServerConfigurationDAO.java Tue Feb 12 00:11:07 2008
@@ -53,8 +53,6 @@
String msg = "Unable to getConfigurationProperty";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return value;
}
@@ -84,8 +82,6 @@
String msg = "Unable to updateConfigurationProperty";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java Tue Feb 12 00:11:07 2008
@@ -60,16 +60,13 @@
try {
service.setLastUpdatedTime(new Date());
session.merge(service);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to update service";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
public ServiceDO getService(String serviceId, String version) {
@@ -78,16 +75,13 @@
ServiceDO serviceDO = null;
try {
serviceDO = getService(serviceId, version, session);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to getService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return serviceDO;
}
@@ -105,9 +99,6 @@
String msg = "Unable to add operation";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -126,9 +117,6 @@
String msg = "Unable to get service operations";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return opDOs;
}
@@ -136,8 +124,8 @@
public OperationDO[] getOperations(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- OperationDO[] opDOs = null;
+ ServiceDO serviceDO;
+ OperationDO[] opDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class, service.getId());
Set opSet = serviceDO.getOperations();
@@ -148,9 +136,6 @@
String msg = "Unable to get service operations";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return opDOs;
}
@@ -158,7 +143,7 @@
public void addUser(String serviceId, String version, ServiceUserDO user) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
user = getUser(user.getUsername(), session);
@@ -174,16 +159,13 @@
String msg = "Unable to addUser";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
public void addRole(String serviceId, String version, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
role = getRole(role.getRole(), session);
@@ -198,9 +180,6 @@
String msg = "Unable to addRole";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -219,7 +198,7 @@
public void addPolicy(String serviceId, String version, ServicePolicyDO policy) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
if (!service.getPolicies().contains(policy)) {
@@ -232,9 +211,6 @@
String msg = "Unable to addPolicy";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -267,8 +243,6 @@
String msg = "Unable to update service policy";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -288,9 +262,6 @@
String msg = "Unable to add parameter";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -309,9 +280,6 @@
String msg = "Unable to get service users";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return userDOs;
}
@@ -319,8 +287,8 @@
public ServiceUserRoleDO[] getRoles(String serviceId, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceUserRoleDO[] userRoleDOs = null;
+ ServiceDO serviceDO;
+ ServiceUserRoleDO[] userRoleDOs;
try {
serviceDO = getService(serviceId, version, session);
Set roleSet = serviceDO.getRoles();
@@ -332,9 +300,6 @@
String msg = "Unable to get roles";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return userRoleDOs;
@@ -343,8 +308,8 @@
public ServicePolicyDO[] getPolicies(String serviceId, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServicePolicyDO[] policyDOs = null;
+ ServiceDO serviceDO;
+ ServicePolicyDO[] policyDOs;
try {
serviceDO = getService(serviceId, version, session);
Set opSet = serviceDO.getPolicies();
@@ -355,9 +320,6 @@
String msg = "Unable to get policies";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return policyDOs;
}
@@ -365,8 +327,8 @@
public ServicePolicyDO[] getPolicies(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServicePolicyDO[] policyDOs = null;
+ ServiceDO serviceDO;
+ ServicePolicyDO[] policyDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class, service.getId());
Set opSet = serviceDO.getPolicies();
@@ -377,9 +339,6 @@
String msg = "Unable to get policies";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return policyDOs;
}
@@ -387,8 +346,8 @@
public ServiceParameterDO[] getParameters(String serviceId, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceParameterDO[] paramDOs = null;
+ ServiceDO serviceDO;
+ ServiceParameterDO[] paramDOs;
try {
serviceDO = getService(serviceId, version, session);
Set opSet = serviceDO.getParameters();
@@ -399,9 +358,6 @@
String msg = "Unable to get parameters";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return paramDOs;
}
@@ -409,8 +365,8 @@
public ServiceParameterDO[] getParameters(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceParameterDO[] paramDOs = null;
+ ServiceDO serviceDO;
+ ServiceParameterDO[] paramDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class, service.getId());
Set paramSet = serviceDO.getParameters();
@@ -422,9 +378,6 @@
String msg = "Unable to get parameters";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return paramDOs;
}
@@ -432,8 +385,7 @@
public ServiceParameterDO getParameter(ServiceDO service, String paramName) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceParameterDO paramDO = null;
+ ServiceParameterDO paramDO;
try {
ServiceIdentifierDO sid = service.getServiceIdentifierDO();
@@ -452,9 +404,6 @@
String msg = "Unable to get parameter";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceDO);
- hbConfig.closeSession();
}
return paramDO;
}
@@ -470,8 +419,6 @@
String msg = "Unable to deleteService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -526,8 +473,6 @@
String msg = "Unable to deleteService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return modules;
}
@@ -547,8 +492,6 @@
String msg = "Unable to deleteService";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return modules;
}
@@ -584,9 +527,6 @@
String msg = "Unable to remove user from service";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -613,9 +553,6 @@
String msg = "Unable to remove role from service";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
@@ -632,9 +569,8 @@
public void removeAllTrustedCertStores(ServiceDO serviceDO) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
try {
- service = (ServiceDO) session.load(ServiceDO.class, serviceDO.getId());
+ ServiceDO service = (ServiceDO) session.load(ServiceDO.class, serviceDO.getId());
for (Iterator iter = service.getTrustedCertStores().iterator(); iter.hasNext();) {
KeyStoreDO keyStoreDO = (KeyStoreDO) iter.next();
keyStoreDO.getTrustStoreServices().remove(service);
@@ -648,9 +584,6 @@
String msg = "Unable to remove all TrustedCertStores from service";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(service);
- hbConfig.closeSession();
}
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java Tue Feb 12 00:11:07 2008
@@ -47,12 +47,12 @@
try {
trasientInstance.setLastUpdatedTime(new Date());
session.persist(trasientInstance);
- session.flush();
tx.commit();
} catch (Exception e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Unable to get createServiceGroup";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return trasientInstance.getId();
@@ -61,7 +61,6 @@
public Long createServiceGroup(ServiceGroupDO trasientInstance, Session session) {
trasientInstance.setLastUpdatedTime(new Date());
session.persist(trasientInstance);
- session.flush();
return trasientInstance.getId();
}
@@ -73,12 +72,12 @@
Criteria criteria = session.createCriteria(ServiceGroupDO.class);
criteria.add(Expression.eq("name", serviceGroupId.trim()));
serviceGroupDO = (ServiceGroupDO) criteria.uniqueResult();
- session.flush();
tx.commit();
} catch (Exception e) {
tx.rollback();
- } finally {
- hbConfig.closeSession();
+ String msg = "Unable to get createServiceGroup";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return serviceGroupDO;
}
@@ -105,9 +104,6 @@
String msg = "Unable to getParameter";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(paramDO);
- hbConfig.closeSession();
}
return paramDO;
}
@@ -124,8 +120,6 @@
String msg = "Unable to get service operations";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return serviceDOs;
}
@@ -159,8 +153,6 @@
String msg = "Unable to delete service group " + serviceGroupName;
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
}
}
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java Tue Feb 12 00:11:07 2008
@@ -45,23 +45,20 @@
Criteria transportCriteria = session.createCriteria(TransportDO.class);
List list = transportCriteria.list();
transports = (TransportDO[]) list.toArray(new TransportDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to get Transports";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return transports;
}
public TransportDO getTransport(String protocol) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- TransportDO transport = null;
+ TransportDO transport;
try {
Criteria transportCriteria = session.createCriteria(TransportDO.class);
transportCriteria.add(Expression.eq("transportProtocol", protocol.trim()));
@@ -72,8 +69,6 @@
String msg = "Unable to get Transport";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return transport;
}
@@ -83,9 +78,4 @@
transportCriteria.add(Expression.eq("transportProtocol", protocol.trim()));
return (TransportDO) transportCriteria.uniqueResult();
}
-
- public void delete(TransportDO transport) {
- //TODO: Method implementation
-
- }
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java Tue Feb 12 00:11:07 2008
@@ -49,16 +49,13 @@
Criteria userCriteria = session.createCriteria(ServiceUserDO.class);
List list = userCriteria.list();
users = (ServiceUserDO[]) list.toArray(new ServiceUserDO[list.size()]);
- session.flush();
tx.commit();
} catch (Throwable e) {
tx.rollback();
String msg = "Unable to retrieve all users";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return users;
}
@@ -85,7 +82,6 @@
}
session.delete(user);
- session.flush();
tx.commit();
} catch (Throwable e) {
e.printStackTrace();
@@ -93,8 +89,6 @@
String msg = "Unable to deleteUser";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
@@ -130,15 +124,13 @@
String msg = "Unable to remove role from user";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
public ServiceUserDO getUser(String username) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO user = null;
+ ServiceUserDO user;
try {
Criteria userCriteria = session.createCriteria(ServiceUserDO.class);
userCriteria.add(Expression.eq("username", username));
@@ -149,8 +141,6 @@
String msg = "Unable to retrieve user";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return user;
}
@@ -158,7 +148,7 @@
public ServiceUserRoleDO[] getUserRoles(ServiceUserDO serviceUserDO) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserRoleDO[] serviceUserRoleDOs = null;
+ ServiceUserRoleDO[] serviceUserRoleDOs;
try {
Set roles = serviceUserDO.getRoles();
@@ -170,9 +160,6 @@
String msg = "Unable to get roles";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceUserDO);
- hbConfig.closeSession();
}
return serviceUserRoleDOs;
}
@@ -180,7 +167,7 @@
public void addRole(String userName, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO userDO = null;
+ ServiceUserDO userDO;
try {
userDO = getUser(userName, session);
role = (ServiceUserRoleDO) session.load(ServiceUserRoleDO.class, role.getId());
@@ -196,9 +183,6 @@
String msg = "Unable to add role";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(userDO);
- hbConfig.closeSession();
}
}
@@ -211,7 +195,7 @@
public ServiceUserRoleDO[] getRoles(String serviceUser) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO serviceUserDO = null;
+ ServiceUserDO serviceUserDO;
ServiceUserRoleDO[] serviceUserRoleDOs = null;
try {
serviceUserDO = getUser(serviceUser, session);
@@ -226,9 +210,6 @@
String msg = "Unable to get roles";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- session.evict(serviceUserDO);
- hbConfig.closeSession();
}
return serviceUserRoleDOs;
}
@@ -236,7 +217,7 @@
public boolean userHasRole(String username, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- boolean containsRole = false;
+ boolean containsRole;
try {
containsRole = getUser(username, session).getRoles().contains(role);
tx.commit();
@@ -245,8 +226,6 @@
String msg = "Unable to get roles";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
return containsRole;
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java Tue Feb 12 00:11:07 2008
@@ -55,16 +55,14 @@
String msg = "Unable to retrieve user roles";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return roles;
}
public ServiceUserRoleDO getUserRole(String role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserRoleDO serviceUserRoleDO = null;
+ ServiceUserRoleDO serviceUserRoleDO;
try {
Criteria roleCriteria = session.createCriteria(ServiceUserRoleDO.class);
roleCriteria.add(Expression.eq("role", role.trim()));
@@ -76,9 +74,7 @@
String msg = "Unable to retrieve user role";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
- }
+ }
return serviceUserRoleDO;
}
@@ -116,8 +112,6 @@
String msg = "Unable to delete role";
log.error(msg, e);
throw new RuntimeException(msg, e);
- } finally {
- hbConfig.closeSession();
}
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java Tue Feb 12 00:11:07 2008
@@ -378,11 +378,20 @@
}
}
+ public void removeAllPolicies() {
+ for (Iterator iter = policies.iterator(); iter.hasNext();) {
+ ServicePolicyDO spDO = (ServicePolicyDO) iter.next();
+ spDO.setService(null);
+ }
+ this.policies.clear();
+ }
+
public void removeAllRelationships() {
removeAllRoles();
removeAllTransports();
removeAllTrustedCertStores();
removeAllUsers();
+ removeAllPolicies();
removeSecurityScenario();
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/util/HibernateConfig.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/util/HibernateConfig.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/src/org/wso2/wsas/util/HibernateConfig.java Tue Feb 12 00:11:07 2008
@@ -29,7 +29,6 @@
*/
public class HibernateConfig {
private final SessionFactory SESSION_FACTORY;
- private final ThreadLocal SESSION = new ThreadLocal();
/**
* Constructor for initializing this Object providing the DB Connection Identifier
@@ -181,19 +180,6 @@
}
public Session currentSession() throws HibernateException {
- Session session = (Session) SESSION.get();
- if (session == null) {
- session = SESSION_FACTORY.openSession();
- SESSION.set(session);
- }
- return session;
- }
-
- public void closeSession() throws HibernateException {
- Session session = (Session) SESSION.get();
- if (session != null) {
- session.close();
- }
- SESSION.set(null);
+ return SESSION_FACTORY.getCurrentSession();
}
}
Modified: branches/wsas/java/2.2/wsas/java/modules/core/test-resources/wso2wsas.hibernate.cfg.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/test-resources/wso2wsas.hibernate.cfg.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/test-resources/wso2wsas.hibernate.cfg.xml Tue Feb 12 00:11:07 2008
@@ -40,6 +40,13 @@
<!-- Posible values for hbm2ddl.auto (update | create | create-drop)-->
<property name="hbm2ddl.auto">create</property>
+ <!-- Enable Hibernate's automatic session context management -->
+ <property name="current_session_context_class">thread</property>
+
+ <property name="hibernate.transaction.flush_before_completion">true</property>
+
+ <property name="hibernate.transaction.auto_close_session">true</property>
+
<mapping resource="wso2wsas.hbm.xml"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java (original)
+++ branches/wsas/java/2.2/wsas/java/modules/core/test/org/wso2/wsas/persistence/PersistenceTest.java Tue Feb 12 00:11:07 2008
@@ -18,10 +18,28 @@
import junit.framework.TestCase;
import org.hibernate.Session;
+import org.hibernate.Transaction;
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.persistence.dao.ServiceGroupDAO;
-import org.wso2.wsas.persistence.dataobject.*;
-import org.wso2.wsas.persistence.exception.*;
+import org.wso2.wsas.persistence.dataobject.MessageDO;
+import org.wso2.wsas.persistence.dataobject.ModuleDO;
+import org.wso2.wsas.persistence.dataobject.ModuleIdentifierDO;
+import org.wso2.wsas.persistence.dataobject.ModuleParameterDO;
+import org.wso2.wsas.persistence.dataobject.OperationDO;
+import org.wso2.wsas.persistence.dataobject.OperationParameterDO;
+import org.wso2.wsas.persistence.dataobject.ServiceDO;
+import org.wso2.wsas.persistence.dataobject.ServiceGroupDO;
+import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
+import org.wso2.wsas.persistence.dataobject.ServiceParameterDO;
+import org.wso2.wsas.persistence.dataobject.ServicePolicyDO;
+import org.wso2.wsas.persistence.dataobject.ServiceUserDO;
+import org.wso2.wsas.persistence.dataobject.ServiceUserRoleDO;
+import org.wso2.wsas.persistence.exception.ModuleAlreadyExistsException;
+import org.wso2.wsas.persistence.exception.ServiceAlreadyExistsException;
+import org.wso2.wsas.persistence.exception.ServiceNotFoundException;
+import org.wso2.wsas.persistence.exception.ServiceUserAlreadyExistsException;
+import org.wso2.wsas.persistence.exception.ServiceUserNotFoundException;
+import org.wso2.wsas.persistence.exception.UserRoleAlreadyExistsException;
import org.wso2.wsas.util.HibernateConfig;
import org.wso2.wsas.util.HibernateConfigFactory;
@@ -59,9 +77,10 @@
}
Session session = hbConfig.currentSession();
+ Transaction tx = session.beginTransaction();
List result = session.createQuery("from ServiceUserDO").list();
+ tx.commit();
validateAdmin(result);
- hbConfig.closeSession();
}
public void testAddModules() {
@@ -73,18 +92,19 @@
}
Session session = hbConfig.currentSession();
+ Transaction tx = session.beginTransaction();
List result =
- session.createQuery("from ModuleDO as mod " +
- "where lower(mod.moduleIdentifierDO.name) " +
+ session.createQuery("from ModuleDO as module " +
+ "where lower(module.moduleIdentifierDO.name) " +
"like 'sandesha%'").list();
validateSandeshaModule(result);
result =
- session.createQuery("from ModuleDO as mod " +
- "where lower(mod.moduleIdentifierDO.name) " +
+ session.createQuery("from ModuleDO as module " +
+ "where lower(module.moduleIdentifierDO.name) " +
"like 'security%'").list();
+ tx.commit();
validateSecurityModule(result);
- hbConfig.closeSession();
}
public void testModifyAdmin() {
@@ -126,13 +146,13 @@
public void testAddService() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO sid = new ServiceIdentifierDO();
- String serviceId = "service" + System.currentTimeMillis();
+ String serviceId = "testAddService-service" + System.currentTimeMillis();
sid.setServiceId(serviceId);
String version = "0.95";
sid.setVersion(version);
service.setServiceIdentifierDO(sid);
+ setServiceGroup(service);
service.setIsUTAuthEnabled(true);
ServiceGroupDO sgDO = new ServiceGroupDO();
sgDO.setName("test-sg-" + System.currentTimeMillis());
@@ -286,7 +306,7 @@
assertEquals(10, usersWithRole.size());*/
}
- public void testAddingSameUserTwice() {
+ public void testAddingSameUserTwice() throws Exception {
ServiceUserRoleDO serviceUserRole = new ServiceUserRoleDO();
long timestamp = System.currentTimeMillis();
String role = "testAddingSameUserTwice-Role" + timestamp;
@@ -294,14 +314,15 @@
try {
pm.addUserRole(serviceUserRole);
} catch (UserRoleAlreadyExistsException e) {
- fail("Unexpected Exception " + e);
+ e.printStackTrace();
+ throw new RuntimeException(e);
}
// Add first time
{
ServiceUserDO serviceUser = new ServiceUserDO();
-// serviceUser.setServiceUserRole(serviceUserRole);
serviceUser.setUsername("testAddingSameUserTwice-username" + timestamp);
+ serviceUser.addRole(serviceUserRole);
serviceUser.setPassword("password");
try {
pm.addUser(serviceUser);
@@ -313,8 +334,8 @@
// Add second time
{
ServiceUserDO serviceUser = new ServiceUserDO();
-// serviceUser.setServiceUserRole(serviceUserRole);
serviceUser.setUsername("testAddingSameUserTwice-username" + timestamp);
+ serviceUser.addRole(serviceUserRole);
serviceUser.setPassword("password");
System.out.println("## THE FOLLOWING EXCEPTION IS AN ANTICIPATED ONE.\n" +
"## THIS UNIT TEST VERIFIES THAT THE SYSTEM THROWS AN EXCEPTION \n" +
@@ -330,17 +351,17 @@
}
public void testAssignUserToService() {
- String username = "AddUserToService-Username" + System.currentTimeMillis();
- String serviceId = "AddUserToService-sid" + System.currentTimeMillis();
+ String username = "testAssignUserToService-Username" + System.currentTimeMillis();
+ String serviceId = "testAssignUserToService-sid" + System.currentTimeMillis();
String version = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
// Add service
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO sid = new ServiceIdentifierDO();
sid.setServiceId(serviceId);
sid.setVersion(version);
service.setServiceIdentifierDO(sid);
+ setServiceGroup(service);
service.setIsUTAuthEnabled(false);
try {
pm.addService(service);
@@ -383,22 +404,15 @@
assertEquals(1, pm.getUsersForService(serviceId, version).length);
}
- public void testGetAllUsers() {
- /*List allUsers = pm.getUsers();
- for (Iterator iterator = allUsers.iterator(); iterator.hasNext();) {
- ServiceUserDO o = (ServiceUserDO) iterator.next();
- }*/
- }
-
public void testAddServiceWithPolicies() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
- String serviceId = "PolicyService" + System.currentTimeMillis();
+ String serviceId = "testAddServiceWithPolicies-PolicyService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
ServicePolicyDO policy1 = new ServicePolicyDO();
policy1.setPolicy("Policy 1");
@@ -426,13 +440,13 @@
public void testAddServiceWithEngagedModules() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
- String serviceId = "TestService" + System.currentTimeMillis();
+ String serviceId = "testAddServiceWithEngagedModules-TestService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
for (int i = 0; i < 10; i++) {
ModuleDO module = new ModuleDO();
@@ -465,13 +479,13 @@
public void testAddMessages() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
- String serviceId = "TestMessageService" + System.currentTimeMillis();
+ String serviceId = "testAddMessages-TestMessageService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
OperationDO operation = new OperationDO();
operation.setName("testOp");
@@ -510,13 +524,13 @@
public void testAddMessagesWithNoOperation() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
- String serviceId = "TestMessageService" + System.currentTimeMillis();
+ String serviceId = "testAddMessagesWithNoOperation-TestMessageService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
try {
pm.addService(service);
@@ -553,7 +567,7 @@
public void testAddServiceWithOperationModuleEngagement() {
ModuleDO module = new ModuleDO();
ModuleIdentifierDO modID = new ModuleIdentifierDO();
- String moduleName = "TEST-MOD" + System.currentTimeMillis();
+ String moduleName = "testAddServiceWithOperationModuleEngagement-TEST-MOD" + System.currentTimeMillis();
modID.setName(moduleName);
String moduleVersion = "Mod-V" + System.currentTimeMillis();
modID.setVersion(moduleVersion);
@@ -567,13 +581,13 @@
}
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
String serviceId = "TestService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
OperationDO op = new OperationDO();
op.setName("op" + System.currentTimeMillis());
@@ -602,7 +616,7 @@
public void testAddModuleWithParameters() {
ModuleDO module = new ModuleDO();
ModuleIdentifierDO modID = new ModuleIdentifierDO();
- String name = "Mod";
+ String name = "testAddModuleWithParameters-Mod" + System.currentTimeMillis();
String version = String.valueOf(System.currentTimeMillis());
modID.setName(name);
modID.setVersion(version);
@@ -631,14 +645,14 @@
}
public void testAddServiceWithParameters() {
- String name = "Service";
+ String name = "testAddServiceWithParameters-Service" + System.currentTimeMillis();
String version = String.valueOf(System.currentTimeMillis());
ServiceIdentifierDO sid = new ServiceIdentifierDO();
sid.setServiceId(name);
sid.setVersion(version);
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
service.setServiceIdentifierDO(sid);
+ setServiceGroup(service);
OperationDO op = new OperationDO();
op.setName("myOp");
@@ -677,22 +691,15 @@
assertEquals("Val2", param2.getValue());
}
- private void setServiceGroup(ServiceDO service) {
- ServiceGroupDO sgDO = new ServiceGroupDO();
- sgDO.setName("test-sg" + System.currentTimeMillis());
- new ServiceGroupDAO(hbConfig).createServiceGroup(sgDO);
- service.setServiceGroup(sgDO);
- }
-
public void testGetMaxMessageSeqNum() {
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
- String serviceId = "TestMessageService" + System.currentTimeMillis();
+ String serviceId = "testGetMaxMessageSeqNum-TestMessageService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
OperationDO operation = new OperationDO();
String opName = "testOperation";
@@ -738,13 +745,13 @@
}
ServiceDO service = new ServiceDO();
- setServiceGroup(service);
ServiceIdentifierDO id = new ServiceIdentifierDO();
String serviceId = "TestService" + System.currentTimeMillis();
id.setServiceId(serviceId);
String version = "V" + System.currentTimeMillis();
id.setVersion(version);
service.setServiceIdentifierDO(id);
+ setServiceGroup(service);
OperationDO op = new OperationDO();
op.setName("op" + System.currentTimeMillis());
@@ -831,4 +838,12 @@
param.setValue(value);
module.addParameter(param);
}
+
+ private void setServiceGroup(ServiceDO service) {
+ ServiceGroupDO sgDO = new ServiceGroupDO();
+ sgDO.setName(service.getServiceIdentifierDO().getServiceId() +
+ "test-sg" + System.currentTimeMillis());
+ new ServiceGroupDAO(hbConfig).createServiceGroup(sgDO);
+ service.setServiceGroup(sgDO);
+ }
}
Modified: branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>sm-list-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -722,7 +722,7 @@
<plugin>
<groupId>org.wso2.maven.plugins</groupId>
<artifactId>js-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>all-js</id>
Modified: branches/wsas/java/2.2/wsas/java/modules/distribution/resources/hibernate.properties
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/distribution/resources/hibernate.properties (original)
+++ branches/wsas/java/2.2/wsas/java/modules/distribution/resources/hibernate.properties Tue Feb 12 00:11:07 2008
@@ -19,4 +19,7 @@
hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
hibernate.connection.url=jdbc:derby:${basedir}/target/dist/temp/wso2wsas-${wso2wsas.version}/database/WSO2WSAS_DB;create=true
hibernate.connection.username=wso2wsas
-hibernate.dialect=org.hibernate.dialect.DerbyDialect
\ No newline at end of file
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+current_session_context_class=thread
+hibernate.transaction.flush_before_completion=true
+hibernate.transaction.auto_close_session=true
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml Tue Feb 12 00:11:07 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/installation_guide.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/installation_guide.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/installation_guide.xml Tue Feb 12 00:11:07 2008
@@ -191,7 +191,7 @@
<pre>
###########################################################
# #
-# WSO2 WSAS v2.2 Installation #
+# WSO2 WSAS v2.2.1 Installation #
# #
###########################################################
@@ -290,7 +290,7 @@
<pre>
###########################################################
# #
-# WSO2 WSAS v2.2 Installation #
+# WSO2 WSAS v2.2.1 Installation #
# #
###########################################################
Modified: branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/release_notes.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/release_notes.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/documentation/src/site/xdoc/release_notes.xml Tue Feb 12 00:11:07 2008
@@ -26,7 +26,7 @@
<h1>WSO2 Web Services Application Server(WSO2 WSAS) @wso2wsas_version@
Release Notes</h1>
- <h3>22nd January 2008</h3>
+ <h3>12th February 2008</h3>
<p>WSO2 WSAS is the Enterprise ready Web services engine powered by Apache Axis2.
It is a lightweight application server for Web services that
Modified: branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>org.wso2.wsas</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/samples/Chad/conf/hibernate/chad.hibernate.cfg.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/samples/Chad/conf/hibernate/chad.hibernate.cfg.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/samples/Chad/conf/hibernate/chad.hibernate.cfg.xml Tue Feb 12 00:11:07 2008
@@ -40,6 +40,13 @@
<!-- Posible values for hbm2ddl.auto (update | create | create-drop)-->
<property name="hbm2ddl.auto">update</property>
+ <!-- Enable Hibernate's automatic session context management -->
+ <property name="current_session_context_class">thread</property>
+
+ <property name="hibernate.transaction.flush_before_completion">true</property>
+
+ <property name="hibernate.transaction.auto_close_session">true</property>
+
<mapping resource="chad.hbm.xml"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/samples/Chad/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/samples/Chad/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/samples/Chad/pom.xml Tue Feb 12 00:11:07 2008
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.wsas</groupId>
<artifactId>wso2wsas-samples</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/wsas/java/2.2/wsas/java/modules/samples/CommodityQuote/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/samples/CommodityQuote/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/modules/samples/Comm