You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/12 18:40:13 UTC
svn commit: r1673029 - in /sling/trunk/launchpad:
builder/src/main/provisioning/ test-bundles/src/main/provisioning/
testing-war/ testing-war/src/main/provisioning/ testing/
testing/src/main/provisioning/
Author: cziegeler
Date: Sun Apr 12 16:40:12 2015
New Revision: 1673029
URL: http://svn.apache.org/r1673029
Log:
Add missing licence headers and move model dependencies into models
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
sling/trunk/launchpad/testing-war/pom.xml
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
sling/trunk/launchpad/testing/pom.xml
sling/trunk/launchpad/testing/src/main/provisioning/model.txt
Modified: sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/boot.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# The :boot feature contains all things to bootstrap the installation.
#
[feature name=:boot]
Modified: sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# The jackrabbit feature for Apache Sling
[feature name=jackrabbit]
Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# The :launchpad feature defines Sling's launchpad version
# Only a single artifact is allowed within this feature.
#
Modified: sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# This is the OAK feature.
[feature name=oak]
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# The feature for Apache Sling
[feature name=sling]
Modified: sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# The :standalone feature contains artifacts for the standalone jar
#
[feature name=standalone]
Modified: sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt (original)
+++ sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt Sun Apr 12 16:40:12 2015
@@ -1,3 +1,21 @@
+#
+# 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.
+#
# Additional bundles for the Sling launchpad tests
[feature name=launchpad-test-bundles]
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Sun Apr 12 16:40:12 2015
@@ -401,27 +401,12 @@
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad</artifactId>
- <version>8-SNAPSHOT</version>
- <type>slingfeature</type>
- <classifier>slingfeature</classifier>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
<version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <!-- The test services bundles -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>slingfeature</type>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Sun Apr 12 16:40:12 2015
@@ -1,6 +1,28 @@
+#
+# 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.
+#
[feature name=launchpad-testing]
- # additional configuration for testing
+# Dependencies
+[artifacts]
+ org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
+# additional configuration for testing
[configurations]
integrationTestsConfig
message="This test config should be loaded at startup"
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Sun Apr 12 16:40:12 2015
@@ -379,14 +379,6 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad</artifactId>
- <version>8-SNAPSHOT</version>
- <type>slingfeature</type>
- <classifier>slingfeature</classifier>
- </dependency>
-
<!-- The integration tests -->
<dependency>
<groupId>org.apache.sling</groupId>
@@ -395,14 +387,6 @@
<scope>test</scope>
</dependency>
- <!-- The test services bundles -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>slingfeature</type>
- </dependency>
-
<!-- Dependencies for the Test Build and Run -->
<dependency>
<groupId>javax.jcr</groupId>
Modified: sling/trunk/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/model.txt?rev=1673029&r1=1673028&r2=1673029&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/model.txt Sun Apr 12 16:40:12 2015
@@ -1,6 +1,29 @@
+#
+# 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.
+#
[feature name=launchpad-testing]
- # additional configuration for testing
+# Dependencies
+[artifacts]
+ org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart
+ org.apache.sling/org.apache.sling.launchpad.test-bundles/0.0.1-SNAPSHOT/slingfeature
+
+# additional configuration for testing
[configurations]
integrationTestsConfig
message="This test config should be loaded at startup"