Author: mriou
Date: Thu Aug 21 19:16:57 2008
New Revision: 687929
URL: http://svn.apache.org/viewvc?rev=687929&view=rev
Log:
Something weird happened during merge.
Modified:
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java?rev=687929&r1=687928&r2=687929&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java
(original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/PubSubTest.java Thu
Aug 21 19:16:57 2008
@@ -30,35 +30,3 @@
go("/bpel/2.0/TestPubSubOutOfProc");
}
}
-/*
- * 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.ode.test;
-
-import org.junit.Test;
-
-public class PubSubTest extends BPELTestAbstract {
-
- @Test public void testPubSubInProc() throws Throwable {
- go("/bpel/2.0/TestPubSubInProc");
- }
-
- @Test public void testPubSubOutOfProc() throws Throwable {
- go("/bpel/2.0/TestPubSubOutOfProc");
- }
-}
