You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/09/06 16:55:33 UTC
svn commit: r1381632 [3/3] - in /karaf/branches/karaf-2.3.x: ./ itests/
itests/dependencies/ itests/kittests/
itests/kittests/src/test/java/org/apache/karaf/kittests/ itests/tests/
itests/tests/src/test/java/org/apache/karaf/shell/itests/ itests/tests/...
Added: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java?rev=1381632&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java (added)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java Thu Sep 6 14:55:30 2012
@@ -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.karaf.tooling.exam.options.configs;
+
+import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
+
+/**
+ * Pre-configured property file pointers to the most commonly used properties in /etc/config.properties and
+ * /etc/org.apache.karaf.management.cfg.
+ */
+public interface ManagementCfg {
+
+ static final String FILE_PATH = "etc/org.apache.karaf.management.cfg";
+
+ /**
+ * Port of the registry for the exported RMI service
+ */
+ static final ConfigurationPointer RMI_REGISTRY_PORT = new CustomPropertiesPointer("rmiRegistryPort");
+
+ /**
+ * Port of the registry for the exported RMI service
+ */
+ static final ConfigurationPointer RMI_SERVER_PORT = new CustomPropertiesPointer("rmiServerPort");
+
+ static class CustomPropertiesPointer extends ConfigurationPointer {
+
+ public CustomPropertiesPointer(String key) {
+ super(FILE_PATH, key);
+ }
+
+ }
+
+}
Added: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java?rev=1381632&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java (added)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java Thu Sep 6 14:55:30 2012
@@ -0,0 +1,39 @@
+/*
+ * 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.karaf.tooling.exam.options.configs;
+
+import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
+
+/**
+ * Pre-configured property file pointers to the most commonly used properties in /etc/config.properties and
+ * /etc/system.properties..
+ */
+public interface SystemProperties {
+
+ static final String FILE_PATH = "etc/system.properties";
+
+ static final ConfigurationPointer KARAF_NAME = new CustomPropertiesPointer("karaf.name");
+
+ static class CustomPropertiesPointer extends ConfigurationPointer {
+
+ public CustomPropertiesPointer(String key) {
+ super(FILE_PATH, key);
+ }
+
+ }
+
+}
Added: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java?rev=1381632&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java (added)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java Thu Sep 6 14:55:30 2012
@@ -0,0 +1,39 @@
+/*
+ * 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.karaf.tooling.exam.options.configs;
+
+import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
+
+/**
+ * Pre-configured property file pointers to the most commonly used properties in /etc/config.properties and
+ * /etc/users.properties.
+ */
+public interface UsersProperties {
+
+ static final String FILE_PATH = "etc/users.properties";
+
+ static final ConfigurationPointer KARAF_USER = new CustomPropertiesPointer("karaf");
+
+ static class CustomPropertiesPointer extends ConfigurationPointer {
+
+ public CustomPropertiesPointer(String key) {
+ super(FILE_PATH, key);
+ }
+
+ }
+
+}
Added: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java?rev=1381632&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java (added)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java Thu Sep 6 14:55:30 2012
@@ -0,0 +1,39 @@
+/*
+ * 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.karaf.tooling.exam.options.configs;
+
+import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
+
+/**
+ * Pre-configured property file pointers to the most commonly used properties in /etc/config.properties and
+ * /etc/org.ops4j.pax.web.cfg.
+ */
+public interface WebCfg {
+
+ static final String FILE_PATH = "etc/org.ops4j.pax.web.cfg";
+
+ static final ConfigurationPointer HTTP_PORT = new CustomPropertiesPointer("org.osgi.service.http.port");
+
+ static class CustomPropertiesPointer extends ConfigurationPointer {
+
+ public CustomPropertiesPointer(String key) {
+ super(FILE_PATH, key);
+ }
+
+ }
+
+}
Copied: karaf/branches/karaf-2.3.x/tooling/exam/pom.xml (from r1380213, karaf/branches/karaf-2.3.x/itests/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/pom.xml?p2=karaf/branches/karaf-2.3.x/tooling/exam/pom.xml&p1=karaf/branches/karaf-2.3.x/itests/pom.xml&r1=1380213&r2=1381632&rev=1381632&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/pom.xml Thu Sep 6 14:55:30 2012
@@ -22,21 +22,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>tooling</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.itests</groupId>
- <artifactId>itests</artifactId>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>exam</artifactId>
<packaging>pom</packaging>
- <name>Apache Karaf :: Integration Tests</name>
+ <name>Apache Karaf :: Tooling :: Exam Testing Framework</name>
+
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
<modules>
- <module>dependencies</module>
- <module>tests</module>
- <module>kittests</module>
+ <module>options</module>
+ <module>container</module>
</modules>
-</project>
+</project>
\ No newline at end of file
Modified: karaf/branches/karaf-2.3.x/tooling/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/pom.xml?rev=1381632&r1=1381631&r2=1381632&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/tooling/pom.xml Thu Sep 6 14:55:30 2012
@@ -36,7 +36,7 @@
<modules>
<module>features-maven-plugin</module>
<module>cmdhelp-maven-plugin</module>
- <module>testing</module>
+ <module>exam</module>
</modules>
</project>