Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1171724 - in /cxf/branches/2.4.x-fixes: ./
 systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java
Date: Fri, 16 Sep 2011 18:56:55 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20110916185655.C55FE238897A@eris.apache.org>

Author: dkulp
Date: Fri Sep 16 18:56:55 2011
New Revision: 1171724

URL: http://svn.apache.org/viewvc?rev=1171724&view=rev
Log:
Merged revisions 1171720 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1171720 | dkulp | 2011-09-16 14:54:53 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Fix compile error on Java5
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java?rev=1171724&r1=1171723&r2=1171724&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/beanincreationexception/DummyPlatformTransactionManager.java Fri Sep 16 18:56:55 2011
@@ -1,46 +1,43 @@
-/**
- * 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.cxf.systest.beanincreationexception;
-
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionStatus;
-
-public class DummyPlatformTransactionManager implements PlatformTransactionManager {
-
-    @Override
-    public void commit(TransactionStatus arg0) throws TransactionException {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public TransactionStatus getTransaction(TransactionDefinition arg0) throws TransactionException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void rollback(TransactionStatus arg0) throws TransactionException {
-        // TODO Auto-generated method stub
-
-    }
-
-}
+/**
+ * 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.cxf.systest.beanincreationexception;
+
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionException;
+import org.springframework.transaction.TransactionStatus;
+
+public class DummyPlatformTransactionManager implements PlatformTransactionManager {
+
+    public void commit(TransactionStatus arg0) throws TransactionException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public TransactionStatus getTransaction(TransactionDefinition arg0) throws TransactionException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void rollback(TransactionStatus arg0) throws TransactionException {
+        // TODO Auto-generated method stub
+
+    }
+
+}