You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/11/27 17:41:44 UTC
svn commit: r721237 - in /labs/magma/trunk/database-jpa-jobs: ./ src/
src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/magma/ src/main/java/org/apache/magma/database/
src/main/java/org/apache/magma/database...
Author: simoneg
Date: Thu Nov 27 08:41:43 2008
New Revision: 721237
URL: http://svn.apache.org/viewvc?rev=721237&view=rev
Log:
LABS-242 : Database specific support for jobs
Added:
labs/magma/trunk/database-jpa-jobs/pom.xml
labs/magma/trunk/database-jpa-jobs/src/
labs/magma/trunk/database-jpa-jobs/src/main/
labs/magma/trunk/database-jpa-jobs/src/main/java/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/CloseTransactionsInJob.aj
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/InstallDatabaseInJob.aj
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/JobHasADatabase.aj
labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/UseSameDatabaseInJob.aj
labs/magma/trunk/database-jpa-jobs/src/main/resources/
labs/magma/trunk/database-jpa-jobs/src/test/
labs/magma/trunk/database-jpa-jobs/src/test/java/
labs/magma/trunk/database-jpa-jobs/src/test/resources/
Added: labs/magma/trunk/database-jpa-jobs/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa-jobs/pom.xml?rev=721237&view=auto
==============================================================================
--- labs/magma/trunk/database-jpa-jobs/pom.xml (added)
+++ labs/magma/trunk/database-jpa-jobs/pom.xml Thu Nov 27 08:41:43 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>magma-parent</artifactId>
+ <groupId>org.apache.magma</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.magma</groupId>
+ <artifactId>database-jpa-jobs</artifactId>
+ <name>Magma JPA-Database Jobs transaction synchronizer</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <description/>
+ <packaging>magma</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.magma</groupId>
+ <artifactId>database-jpa</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.magma</groupId>
+ <artifactId>foundation-jobs</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/CloseTransactionsInJob.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/CloseTransactionsInJob.aj?rev=721237&view=auto
==============================================================================
--- labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/CloseTransactionsInJob.aj (added)
+++ labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/CloseTransactionsInJob.aj Thu Nov 27 08:41:43 2008
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.database.openjpa;
+
+import org.apache.magma.jobs.Job;
+
+/**
+ * Closes all {@link JPADatabase}s and relative transactions at the end of a job.
+ * @author Simone Gianni <si...@apache.org>
+ */
+public aspect CloseTransactionsInJob {
+
+ pointcut jobExecuting(Job job) : execution(void Job+.run()) && this(job);
+
+ after(Job job) returning : jobExecuting(job) {
+ if (job.db == null) return;
+ try {
+ ((JPADatabase)job.db).commit();
+ } finally {
+ JPADatabasesRegistry.remove(((JPADatabase)job.db));
+ }
+ }
+
+ after(Job job) throwing : jobExecuting(job) {
+ if (job.db == null) return;
+ try {
+ ((JPADatabase)job.db).rollback();
+ } finally {
+ JPADatabasesRegistry.remove(((JPADatabase)job.db));
+ }
+ }
+}
Added: labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/InstallDatabaseInJob.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/InstallDatabaseInJob.aj?rev=721237&view=auto
==============================================================================
--- labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/InstallDatabaseInJob.aj (added)
+++ labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/InstallDatabaseInJob.aj Thu Nov 27 08:41:43 2008
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.database.openjpa;
+
+import org.apache.magma.database.Database;
+import org.apache.magma.jobs.Job;
+import org.apache.magma.jobs.JobStatus;
+
+/**
+ * Forces every job to use only one instance of the JPADatabase.
+ * @author Simone Gianni <si...@apache.org>
+ */
+public aspect InstallDatabaseInJob percflow(jobCreation()) {
+
+ declare precedence : InstallDatabaseInJob, InstallJPADatabase;
+
+ private Database currentdb = null;
+ pointcut jobCreation() : execution(Job JobStatus+.createInstance());
+
+ Database around() : InstallJPADatabase.databaseCreation() {
+ if (currentdb == null) {
+ currentdb = proceed();
+ }
+ return currentdb;
+ }
+
+ after(Job job) : execution(Job+.new(..)) && this(job) {
+ if (job != null) {
+ job.db = currentdb;
+ }
+ }
+
+}
Added: labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/JobHasADatabase.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/JobHasADatabase.aj?rev=721237&view=auto
==============================================================================
--- labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/JobHasADatabase.aj (added)
+++ labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/JobHasADatabase.aj Thu Nov 27 08:41:43 2008
@@ -0,0 +1,10 @@
+package org.apache.magma.database.openjpa;
+
+import org.apache.magma.database.Database;
+import org.apache.magma.jobs.Job;
+
+public aspect JobHasADatabase {
+
+ Database Job.db = null;
+
+}
Added: labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/UseSameDatabaseInJob.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/UseSameDatabaseInJob.aj?rev=721237&view=auto
==============================================================================
--- labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/UseSameDatabaseInJob.aj (added)
+++ labs/magma/trunk/database-jpa-jobs/src/main/java/org/apache/magma/database/openjpa/UseSameDatabaseInJob.aj Thu Nov 27 08:41:43 2008
@@ -0,0 +1,17 @@
+package org.apache.magma.database.openjpa;
+
+import org.apache.magma.database.Database;
+import org.apache.magma.jobs.Job;
+
+public aspect UseSameDatabaseInJob {
+
+ declare precedence : UseSameDatabaseInJob, *, InstallJPADatabase;
+
+ Database around(Job job) : InstallJPADatabase.databaseCreation() && withincode(void Job+.run()) && this(job) {
+ if (job.db == null) {
+ job.db = proceed(job);
+ }
+ return job.db;
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org