You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/06/22 12:09:44 UTC
aries-rsa git commit: [ARIES-1579] Add licenses, protect vs Exception
Repository: aries-rsa
Updated Branches:
refs/heads/master 08463cb24 -> 954aeda55
[ARIES-1579] Add licenses, protect vs Exception
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/954aeda5
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/954aeda5
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/954aeda5
Branch: refs/heads/master
Commit: 954aeda558d4b1068e066eeb14a95b2c9d5a1c47
Parents: 08463cb
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Jun 22 14:09:35 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Jun 22 14:09:35 2016 +0200
----------------------------------------------------------------------
.../aries/rsa/itests/felix/RsaTestBase.java | 19 +++++++++++++++
.../rsa/itests/felix/ServerConfiguration.java | 19 +++++++++++++++
.../rsa/itests/felix/TwoContainerPaxExam.java | 25 +++++++++++++++++++-
.../itests/felix/tcp/TestDiscoveryExport.java | 3 +--
4 files changed, 63 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/954aeda5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 1e63729..1dcfd38 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -1,3 +1,22 @@
+/**
+ * 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.aries.rsa.itests.felix;
import static org.ops4j.pax.exam.CoreOptions.composite;
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/954aeda5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/ServerConfiguration.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/ServerConfiguration.java
index ab4e8f5..0afb971 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/ServerConfiguration.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/ServerConfiguration.java
@@ -1,3 +1,22 @@
+/**
+ * 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.aries.rsa.itests.felix;
import java.lang.annotation.ElementType;
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/954aeda5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
index 555a5ac..f839dea 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/TwoContainerPaxExam.java
@@ -1,3 +1,22 @@
+/**
+ * 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.aries.rsa.itests.felix;
import java.lang.reflect.Method;
@@ -33,7 +52,11 @@ public class TwoContainerPaxExam extends PaxExam {
throw new RuntimeException(e);
} finally {
if (remoteContainer != null) {
- remoteContainer.stop();
+ try {
+ remoteContainer.stop();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/954aeda5/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
index 997872d..95732fd 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
@@ -1,4 +1,3 @@
-package org.apache.aries.rsa.itests.felix.tcp;
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,7 @@ package org.apache.aries.rsa.itests.felix.tcp;
* specific language governing permissions and limitations
* under the License.
*/
-
+package org.apache.aries.rsa.itests.felix.tcp;
import java.io.ByteArrayInputStream;
import java.util.List;