syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1524077 - in /syncope/trunk: ./ core/ core/src/main/resources/quartz/ core/src/main/webapp/WEB-INF/ core/src/test/resources/jboss/
Date Tue, 17 Sep 2013 14:48:16 GMT
Author: ilgrosso
Date: Tue Sep 17 14:48:15 2013
New Revision: 1524077

URL: http://svn.apache.org/r1524077
Log:
Upgrading Quartz to 2.2.0 and adjusting JBoss AS support

Modified:
    syncope/trunk/core/pom.xml
    syncope/trunk/core/src/main/resources/quartz/tables_h2.sql
    syncope/trunk/core/src/main/resources/quartz/tables_mysql.sql
    syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql
    syncope/trunk/core/src/main/resources/quartz/tables_oracle.sql
    syncope/trunk/core/src/main/resources/quartz/tables_postgres.sql
    syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql
    syncope/trunk/core/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
    syncope/trunk/pom.xml

Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Tue Sep 17 14:48:15 2013
@@ -180,18 +180,6 @@ under the License.
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz-oracle</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz-jboss</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz-weblogic</artifactId>
-    </dependency>
       
     <dependency>
       <groupId>org.apache.cocoon.sax</groupId>
@@ -1100,6 +1088,31 @@ under the License.
                   <goal>run</goal>
                 </goals>
               </execution>
+              <!-- This complex setup is needed because 
+                     (a) JBoss 7.2 is needed (and RedHat does not provide a build release
yet)
+                     (b) it seems there is no clean way to upgrade JBoss' JAX-RS APIs. -->
+              <execution>
+                <id>setupJBoss72</id>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <target>
+                    <get src="https://olex-secure.openlogic.com/content/openlogic/jboss/7.2.0.Final/openlogic-jboss-7.2.0.Final-all-bin-1.zip"
+                         dest="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives"
+                         usetimestamp="true"/>
+                    <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/openlogic-jboss-7.2.0.Final-all-bin-1.zip"

+                           dest="${project.build.directory}"/>
+                    <move file="${project.build.directory}/jboss-7.2.0.Final/jboss-as-7.2.0.Final"

+                          tofile="${project.build.directory}/openlogic-jboss-7.2.0.Final"/>
+                    <delete dir="${project.build.directory}/jboss-7.2.0.Final"/>
+                    <copy file="${cargo.run.dir}/WEB-INF/lib/javax.ws.rs-api-${jax-rs.version}.jar"
+                          tofile="${project.build.directory}/openlogic-jboss-7.2.0.Final/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_1.1_spec-1.0.1.Final.jar"
+                          overwrite="true"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
             </executions>
           </plugin>
                 
@@ -1109,12 +1122,8 @@ under the License.
             <inherited>true</inherited>
             <configuration>
               <container>
-                <containerId>jboss71x</containerId>
-                <zipUrlInstaller>
-                  <url>http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.zip</url>
-                  <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
-                  <extractDir>${project.build.directory}/cargo/extract</extractDir>
-                </zipUrlInstaller>
+                <containerId>jboss72x</containerId>
+                <home>${project.build.directory}/openlogic-jboss-7.2.0.Final</home>
                 <log>${cargo.log}</log>
                 <output>${cargo.output}</output>
               </container>

Modified: syncope/trunk/core/src/main/resources/quartz/tables_h2.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_h2.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_h2.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_h2.sql Tue Sep 17 14:48:15 2013
@@ -46,6 +46,7 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS (
   TRIGGER_GROUP VARCHAR (200)  NOT NULL ,
   INSTANCE_NAME VARCHAR (200)  NOT NULL ,
   FIRED_TIME BIGINT NOT NULL ,
+  SCHED_TIME BIGINT NOT NULL ,
   PRIORITY INTEGER NOT NULL ,
   STATE VARCHAR (16)  NOT NULL,
   JOB_NAME VARCHAR (200)  NULL ,

Modified: syncope/trunk/core/src/main/resources/quartz/tables_mysql.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_mysql.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_mysql.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_mysql.sql Tue Sep 17 14:48:15 2013
@@ -174,6 +174,7 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS
     TRIGGER_GROUP VARCHAR(200) NOT NULL,
     INSTANCE_NAME VARCHAR(200) NOT NULL,
     FIRED_TIME BIGINT(13) NOT NULL,
+    SCHED_TIME BIGINT(13) NOT NULL,
     PRIORITY INTEGER NOT NULL,
     STATE VARCHAR(16) NOT NULL,
     JOB_NAME VARCHAR(200) NULL,

Modified: syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql Tue Sep 17 14:48:15
2013
@@ -73,7 +73,6 @@ CALENDAR_NAME VARCHAR(200) NULL,
 MISFIRE_INSTR SMALLINT(2) NULL,
 JOB_DATA BLOB NULL,
 PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-INDEX (SCHED_NAME,JOB_NAME, JOB_GROUP),
 FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
 REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP))
 ENGINE=InnoDB;
@@ -88,7 +87,6 @@ REPEAT_COUNT BIGINT(7) NOT NULL,
 REPEAT_INTERVAL BIGINT(12) NOT NULL,
 TIMES_TRIGGERED BIGINT(10) NOT NULL,
 PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
 FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
 REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
 ENGINE=InnoDB;
@@ -102,7 +100,6 @@ TRIGGER_GROUP VARCHAR(200) NOT NULL,
 CRON_EXPRESSION VARCHAR(120) NOT NULL,
 TIME_ZONE_ID VARCHAR(80),
 PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
-INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
 FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
 REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
 ENGINE=InnoDB;
@@ -169,6 +166,7 @@ TRIGGER_NAME VARCHAR(200) NOT NULL,
 TRIGGER_GROUP VARCHAR(200) NOT NULL,
 INSTANCE_NAME VARCHAR(200) NOT NULL,
 FIRED_TIME BIGINT(13) NOT NULL,
+SCHED_TIME BIGINT(13) NOT NULL,
 PRIORITY INTEGER NOT NULL,
 STATE VARCHAR(16) NOT NULL,
 JOB_NAME VARCHAR(200) NULL,

Modified: syncope/trunk/core/src/main/resources/quartz/tables_oracle.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_oracle.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_oracle.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_oracle.sql Tue Sep 17 14:48:15 2013
@@ -160,6 +160,7 @@ CREATE TABLE qrtz_fired_triggers 
     TRIGGER_GROUP VARCHAR2(200) NOT NULL,
     INSTANCE_NAME VARCHAR2(200) NOT NULL,
     FIRED_TIME NUMBER(13) NOT NULL,
+    SCHED_TIME NUMBER(13) NOT NULL,
     PRIORITY NUMBER(13) NOT NULL,
     STATE VARCHAR2(16) NOT NULL,
     JOB_NAME VARCHAR2(200) NULL,
@@ -205,5 +206,3 @@ create index idx_qrtz_ft_j_g on qrtz_fir
 create index idx_qrtz_ft_jg on qrtz_fired_triggers(SCHED_NAME,JOB_GROUP);
 create index idx_qrtz_ft_t_g on qrtz_fired_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
 create index idx_qrtz_ft_tg on qrtz_fired_triggers(SCHED_NAME,TRIGGER_GROUP);
-
-

Modified: syncope/trunk/core/src/main/resources/quartz/tables_postgres.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_postgres.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_postgres.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_postgres.sql Tue Sep 17 14:48:15 2013
@@ -151,6 +151,7 @@ CREATE TABLE qrtz_fired_triggers 
     TRIGGER_GROUP VARCHAR(200) NOT NULL,
     INSTANCE_NAME VARCHAR(200) NOT NULL,
     FIRED_TIME BIGINT NOT NULL,
+    SCHED_TIME BIGINT NOT NULL,
     PRIORITY INTEGER NOT NULL,
     STATE VARCHAR(16) NOT NULL,
     JOB_NAME VARCHAR(200) NULL,

Modified: syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql (original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql Tue Sep 17 14:48:15
2013
@@ -15,11 +15,72 @@
 -- specific language governing permissions and limitations
 -- under the License.
 
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]')
AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
+ALTER TABLE [dbo].[QRTZ_TRIGGERS] DROP CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
+ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] DROP CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
+ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
+ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CALENDARS]') AND
OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_CALENDARS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CRON_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_CRON_TRIGGERS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_BLOB_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_BLOB_TRIGGERS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_FIRED_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_FIRED_TRIGGERS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_PAUSED_TRIGGER_GRPS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SCHEDULER_STATE]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_SCHEDULER_STATE]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_LOCKS]') AND OBJECTPROPERTY(id,
N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_LOCKS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_JOB_DETAILS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_JOB_DETAILS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPLE_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPROP_TRIGGERS]')
AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND
OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
+DROP TABLE [dbo].[QRTZ_TRIGGERS]
+GO
+
 CREATE TABLE [dbo].[QRTZ_CALENDARS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
   [CALENDAR_NAME] [VARCHAR] (200)  NOT NULL ,
   [CALENDAR] [IMAGE] NOT NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_CRON_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -27,7 +88,8 @@ CREATE TABLE [dbo].[QRTZ_CRON_TRIGGERS] 
   [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
   [CRON_EXPRESSION] [VARCHAR] (120)  NOT NULL ,
   [TIME_ZONE_ID] [VARCHAR] (80) 
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_FIRED_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -36,30 +98,35 @@ CREATE TABLE [dbo].[QRTZ_FIRED_TRIGGERS]
   [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
   [INSTANCE_NAME] [VARCHAR] (200)  NOT NULL ,
   [FIRED_TIME] [BIGINT] NOT NULL ,
+  [SCHED_TIME] [BIGINT] NOT NULL ,
   [PRIORITY] [INTEGER] NOT NULL ,
   [STATE] [VARCHAR] (16)  NOT NULL,
   [JOB_NAME] [VARCHAR] (200)  NULL ,
   [JOB_GROUP] [VARCHAR] (200)  NULL ,
   [IS_NONCONCURRENT] [VARCHAR] (1)  NULL ,
   [REQUESTS_RECOVERY] [VARCHAR] (1)  NULL 
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
   [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL 
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_SCHEDULER_STATE] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
   [INSTANCE_NAME] [VARCHAR] (200)  NOT NULL ,
   [LAST_CHECKIN_TIME] [BIGINT] NOT NULL ,
   [CHECKIN_INTERVAL] [BIGINT] NOT NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_LOCKS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
   [LOCK_NAME] [VARCHAR] (40)  NOT NULL 
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_JOB_DETAILS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -72,7 +139,8 @@ CREATE TABLE [dbo].[QRTZ_JOB_DETAILS] (
   [IS_UPDATE_DATA] [VARCHAR] (1)  NOT NULL ,
   [REQUESTS_RECOVERY] [VARCHAR] (1)  NOT NULL ,
   [JOB_DATA] [IMAGE] NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -81,7 +149,8 @@ CREATE TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS
   [REPEAT_COUNT] [BIGINT] NOT NULL ,
   [REPEAT_INTERVAL] [BIGINT] NOT NULL ,
   [TIMES_TRIGGERED] [BIGINT] NOT NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -98,14 +167,16 @@ CREATE TABLE [dbo].[QRTZ_SIMPROP_TRIGGER
   [DEC_PROP_2] [NUMERIC] (13,4) NULL,
   [BOOL_PROP_1] [VARCHAR] (1) NULL,
   [BOOL_PROP_2] [VARCHAR] (1) NULL,
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_BLOB_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
   [TRIGGER_NAME] [VARCHAR] (200)  NOT NULL ,
   [TRIGGER_GROUP] [VARCHAR] (200)  NOT NULL ,
   [BLOB_DATA] [IMAGE] NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 CREATE TABLE [dbo].[QRTZ_TRIGGERS] (
   [SCHED_NAME] [VARCHAR] (120)  NOT NULL ,
@@ -124,14 +195,16 @@ CREATE TABLE [dbo].[QRTZ_TRIGGERS] (
   [CALENDAR_NAME] [VARCHAR] (200)  NULL ,
   [MISFIRE_INSTR] [SMALLINT] NULL ,
   [JOB_DATA] [IMAGE] NULL
-) ON [PRIMARY];
+) ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_CALENDARS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_CALENDARS] PRIMARY KEY  CLUSTERED
   (
     [SCHED_NAME],
     [CALENDAR_NAME]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_CRON_TRIGGERS] PRIMARY KEY  CLUSTERED
@@ -139,35 +212,40 @@ ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] W
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_FIRED_TRIGGERS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_FIRED_TRIGGERS] PRIMARY KEY  CLUSTERED
   (
     [SCHED_NAME],
     [ENTRY_ID]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_PAUSED_TRIGGER_GRPS] PRIMARY KEY  CLUSTERED
   (
     [SCHED_NAME],
     [TRIGGER_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_SCHEDULER_STATE] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_SCHEDULER_STATE] PRIMARY KEY  CLUSTERED
   (
     [SCHED_NAME],
     [INSTANCE_NAME]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_LOCKS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_LOCKS] PRIMARY KEY  CLUSTERED
   (
     [SCHED_NAME],
     [LOCK_NAME]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_JOB_DETAILS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_JOB_DETAILS] PRIMARY KEY  CLUSTERED
@@ -175,7 +253,8 @@ ALTER TABLE [dbo].[QRTZ_JOB_DETAILS] WIT
     [SCHED_NAME],
     [JOB_NAME],
     [JOB_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_SIMPLE_TRIGGERS] PRIMARY KEY  CLUSTERED
@@ -183,7 +262,8 @@ ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS]
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_SIMPROP_TRIGGERS] PRIMARY KEY  CLUSTERED
@@ -191,7 +271,8 @@ ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_TRIGGERS] WITH NOCHECK ADD
   CONSTRAINT [PK_QRTZ_TRIGGERS] PRIMARY KEY  CLUSTERED
@@ -199,7 +280,8 @@ ALTER TABLE [dbo].[QRTZ_TRIGGERS] WITH N
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON [PRIMARY];
+  )  ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] ADD
   CONSTRAINT [FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
@@ -211,7 +293,8 @@ ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] A
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON DELETE CASCADE;
+  ) ON DELETE CASCADE
+GO
 
 ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] ADD
   CONSTRAINT [FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
@@ -223,7 +306,8 @@ ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS]
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON DELETE CASCADE;
+  ) ON DELETE CASCADE
+GO
 
 ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] ADD
   CONSTRAINT [FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS] FOREIGN KEY
@@ -235,7 +319,8 @@ ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS
     [SCHED_NAME],
     [TRIGGER_NAME],
     [TRIGGER_GROUP]
-  ) ON DELETE CASCADE;
+  ) ON DELETE CASCADE
+GO
 
 ALTER TABLE [dbo].[QRTZ_TRIGGERS] ADD
   CONSTRAINT [FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS] FOREIGN KEY
@@ -247,4 +332,5 @@ ALTER TABLE [dbo].[QRTZ_TRIGGERS] ADD
     [SCHED_NAME],
     [JOB_NAME],
     [JOB_GROUP]
-  );
+  )
+GO

Modified: syncope/trunk/core/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/webapp/WEB-INF/jboss-deployment-structure.xml?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (original)
+++ syncope/trunk/core/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Tue Sep 17 14:48:15
2013
@@ -16,14 +16,20 @@ software distributed under the License i
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-
 -->
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
   <deployment>
+    <exclude-subsystems>
+      <subsystem name="webservices"/>
+      <subsystem name="jaxrs"/>
+    </exclude-subsystems>
     <dependencies>
       <module name="org.apache.xalan"/>
     </dependencies>
     <exclusions>
+      <module name="javax.ws.rs.api"/>
+      <module name="org.apache.cxf"/>
+      <module name="org.apache.cxf.impl"/>
       <module name="org.hibernate"/>
       <module name="org.slf4j"/>
       <module name="org.slf4j.impl"/>

Modified: syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml (original)
+++ syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml Tue Sep 17
14:48:15 2013
@@ -54,7 +54,7 @@ under the License.
         <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
         
         <entry key="openjpa.MetaDataFactory"
-               value="org.apache.syncope.core.persistence.openjpa.JBossPersistenceMappingFactory(URLs=vfs:${project.build.directory}/cargo/configurations/jboss71x/deployments/${project.build.finalName}.war/WEB-INF/classes/,
Resources=META-INF/orm.xml)"/>
+               value="org.apache.syncope.core.persistence.openjpa.JBossPersistenceMappingFactory(URLs=vfs:${project.build.directory}/cargo/configurations/jboss72x/deployments/${project.build.finalName}.war/WEB-INF/classes/,
Resources=META-INF/orm.xml)"/>
       </map>
     </property>
   </bean>

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1524077&r1=1524076&r2=1524077&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Sep 17 14:48:15 2013
@@ -295,6 +295,7 @@ under the License.
     <servlet-api.version>2.5</servlet-api.version>
     <jsp-api.version>2.2</jsp-api.version>
     <jstl.version>1.2</jstl.version>
+    <jax-rs.version>2.0-m15</jax-rs.version>
         
     <connid.version>1.3.3</connid.version>
     <connid.soap.version>1.2.6</connid.soap.version>
@@ -316,7 +317,7 @@ under the License.
     <jackson.version>2.2.2</jackson.version>
     <xstream.version>1.4.4</xstream.version>
     <velocity.version>1.7</velocity.version>
-    <quartz.version>2.1.7</quartz.version>
+    <quartz.version>2.2.0</quartz.version>
 
     <openjpa.version>2.2.2</openjpa.version>
     <bval.version>0.5</bval.version>
@@ -590,7 +591,7 @@ under the License.
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>javax.ws.rs-api</artifactId>
-        <version>2.0-m15</version>
+        <version>${jax-rs.version}</version>
       </dependency>
           	  
       <!-- CXF -->
@@ -650,22 +651,7 @@ under the License.
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.quartz-scheduler</groupId>
-        <artifactId>quartz-oracle</artifactId>
-        <version>${quartz.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.quartz-scheduler</groupId>
-        <artifactId>quartz-jboss</artifactId>
-        <version>${quartz.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.quartz-scheduler</groupId>
-        <artifactId>quartz-weblogic</artifactId>
-        <version>${quartz.version}</version>
-      </dependency>
-      
+            
       <dependency>
         <groupId>org.apache.cocoon.sax</groupId>
         <artifactId>cocoon-sax</artifactId>



Mime
View raw message