You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/15 17:18:20 UTC
[1/6] git commit: Added apache-rat to main build (verify phase)
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c0bd46d5b -> a09ae7d49
Added apache-rat to main build (verify phase)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/836b429b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/836b429b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/836b429b
Branch: refs/heads/master
Commit: 836b429b02bfb423d975877e54c5aa407bfb2951
Parents: c0bd46d
Author: Martin Harris <gi...@nakomis.com>
Authored: Mon Jul 7 12:06:21 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Jul 15 10:37:52 2014 +0100
----------------------------------------------------------------------
pom.xml | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 77 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/836b429b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df490aa..dad8570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -606,22 +606,6 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <!-- Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
- <configuration>
- <!--
- If you wish to override this list in the component (child) pom, ensure you use
- <excludes combine.children="merge">
- so that the child pom entries replace the parent entries
- -->
- <excludes combine.children="append">
- <exclude>.checkstyle</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -712,6 +696,83 @@
</execution>
</executions>
</plugin>
+ <!-- Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!--
+ If you wish to override this list in the component (child) pom, ensure you use
+ <excludes combine.children="merge">
+ so that the child pom entries replace the parent entries
+ -->
+ <excludes combine.children="append">
+ <!-- git and IDE project files -->
+ <!-- see https://issues.apache.org/jira/browse/RAT-107 -->
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/brooklyn*.log.*</exclude>
+ <!-- files not requiring licence -->
+ <exclude>ignored/**</exclude>
+ <exclude>LICENSE.md</exclude>
+ <exclude>**/MANIFEST.MF</exclude>
+ <exclude>**/test-output/**</exclude>
+ <exclude>**/*.pem.pub</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/*.crt</exclude>
+ <exclude>**/*.csr</exclude>
+ <exclude>**/*.key</exclude>
+ <exclude>**/*.key.org</exclude>
+ <exclude>**/*.psd</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/target/classes/**</exclude>
+ <exclude>**/src/test/resources/ssl/certs/localhost/info.txt</exclude>
+ <exclude>**/sandbox/examples/src/main/scripts/amis.txt</exclude>
+ <!-- see notes in https://issues.apache.org/jira/browse/BROOKLYN-18 -->
+ <!-- TODO: Once reviewed and accepted, these entries should be moved into the subproject's pom.xml file -->
+ <!-- the have been grouped here for easier review -->
+ <exclude>**/dropwizard/src/main/resources/banner.txt</exclude>
+ <exclude>**/services/brooklyn.location.LocationResolver</exclude>
+ <exclude>**/src/main/resources/brooklyn/location/geo/external-ip-address-resolvers.txt</exclude>
+ <exclude>**/src/test/resources/brooklyn/entity/basic/template_with_extra_substitutions.txt</exclude>
+ <exclude>**/src/main/resources/brooklyn/entity/nosql/couchdb/couch.uri</exclude>
+ <exclude>**/src/main/resources/brooklyn/entity/nosql/riak/vm.args</exclude>
+ <!-- brooklyn-jsgui -->
+ <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
+ <exclude>**/src/main/dev/info.txt</exclude>
+ <exclude>**/src/main/dev/js/libs/*</exclude>
+ <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
+ <exclude>**/src/test/javascript/config.txt</exclude>
+ <!-- brooklyn-archetype-quickstart -->
+ <exclude>**/src/test/resources/projects/integration-test-1/goal.txt</exclude>
+ <!-- brooklyn-examples-parent -->
+ <exclude>**/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom</exclude>
+ <!-- simple-messaging-pubsub -->
+ <exclude>**/src/main/resources/passwd</exclude>
+ <!-- brooklyn-qa -->
+ <exclude>**/log-exclusions.txt</exclude>
+ <!-- FIXME: Check licences for docs -->
+ <exclude>docs/**</exclude>
+ <!-- FIXME: Maxmind code to be removed due to licence, see https://issues.apache.org/jira/browse/BROOKLYN-32-->
+ <exclude>**/src/3rd/maxmind/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<extensions>
<extension>
[5/6] git commit: Rebased,
fixes files that have been subsequently added without headers
Posted by al...@apache.org.
Rebased, fixes files that have been subsequently added without headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cd4bac7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cd4bac7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cd4bac7e
Branch: refs/heads/master
Commit: cd4bac7ee334979d553b626673359dcc06636a9e
Parents: 2a7e7bf
Author: Martin Harris <gi...@nakomis.com>
Authored: Tue Jul 15 11:08:33 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Jul 15 11:08:33 2014 +0100
----------------------------------------------------------------------
.../BrooklynClassLoadingContext.java | 18 ++++++++++++++++++
.../AbstractBrooklynClassLoadingContext.java | 18 ++++++++++++++++++
.../BrooklynClassLoadingContextSequential.java | 18 ++++++++++++++++++
.../JavaBrooklynClassLoadingContext.java | 18 ++++++++++++++++++
.../OsgiBrooklynClassLoadingContext.java | 18 ++++++++++++++++++
core/src/test/dependencies/osgi/entities/pom.xml | 19 +++++++++++++++++++
.../brooklyn/osgi/tests/SimpleApplication.java | 18 ++++++++++++++++++
.../osgi/tests/SimpleApplicationImpl.java | 18 ++++++++++++++++++
.../java/brooklyn/osgi/tests/SimpleEntity.java | 18 ++++++++++++++++++
.../brooklyn/osgi/tests/SimpleEntityImpl.java | 18 ++++++++++++++++++
core/src/test/resources/brooklyn/osgi/README.md | 18 ++++++++++++++++++
.../elasticsearch/ElasticSearchCluster.java | 18 ++++++++++++++++++
.../elasticsearch/ElasticSearchClusterImpl.java | 18 ++++++++++++++++++
.../nosql/elasticsearch/ElasticSearchNode.java | 18 ++++++++++++++++++
.../elasticsearch/ElasticSearchNodeDriver.java | 18 ++++++++++++++++++
.../elasticsearch/ElasticSearchNodeImpl.java | 18 ++++++++++++++++++
.../ElasticSearchNodeSshDriver.java | 18 ++++++++++++++++++
.../ElasticSearchClusterIntegrationTest.java | 18 ++++++++++++++++++
.../ElasticSearchNodeIntegrationTest.java | 18 ++++++++++++++++++
.../brooklyn/camp/brooklyn/CatalogYamlTest.java | 18 ++++++++++++++++++
.../test/PlatformTestSelectorListener.java | 18 ++++++++++++++++++
21 files changed, 379 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/api/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContext.java b/api/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContext.java
index cba2bc5..2e79f57 100644
--- a/api/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContext.java
+++ b/api/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContext.java
@@ -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.
+ */
package brooklyn.management.classloading;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
index fe1b45e..7a3cd2c 100644
--- a/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
+++ b/core/src/main/java/brooklyn/management/classloading/AbstractBrooklynClassLoadingContext.java
@@ -7,6 +7,24 @@ import brooklyn.util.guava.Maybe;
import com.google.common.base.Objects;
+/*
+ * 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.
+ */
public abstract class AbstractBrooklynClassLoadingContext implements BrooklynClassLoadingContext {
protected final ManagementContext mgmt;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
index 7889de4..5012dc0 100644
--- a/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
+++ b/core/src/main/java/brooklyn/management/classloading/BrooklynClassLoadingContextSequential.java
@@ -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.
+ */
package brooklyn.management.classloading;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java
index bc6b4d2..7783b25 100644
--- a/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/brooklyn/management/classloading/JavaBrooklynClassLoadingContext.java
@@ -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.
+ */
package brooklyn.management.classloading;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
index 7011354..2b9058a 100644
--- a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
+++ b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
@@ -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.
+ */
package brooklyn.management.classloading;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/dependencies/osgi/entities/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/pom.xml b/core/src/test/dependencies/osgi/entities/pom.xml
index 8fa76f0..c1bcb90 100644
--- a/core/src/test/dependencies/osgi/entities/pom.xml
+++ b/core/src/test/dependencies/osgi/entities/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
index a590a59..79d8550 100644
--- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplication.java
@@ -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.
+ */
package brooklyn.osgi.tests;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
index dcc2ce4..acf6a46 100644
--- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleApplicationImpl.java
@@ -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.
+ */
package brooklyn.osgi.tests;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
index 6761ef3..496f386 100644
--- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntity.java
@@ -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.
+ */
package brooklyn.osgi.tests;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
index 04b2251..66a6655 100644
--- a/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
+++ b/core/src/test/dependencies/osgi/entities/src/main/java/brooklyn/osgi/tests/SimpleEntityImpl.java
@@ -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.
+ */
package brooklyn.osgi.tests;
import brooklyn.entity.basic.AbstractEntity;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/core/src/test/resources/brooklyn/osgi/README.md
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/osgi/README.md b/core/src/test/resources/brooklyn/osgi/README.md
index ad6e4d3..7225e90 100644
--- a/core/src/test/resources/brooklyn/osgi/README.md
+++ b/core/src/test/resources/brooklyn/osgi/README.md
@@ -1 +1,19 @@
Sample OSGi bundle files included here, either are built from /src/dependencies in this project, or contain their sources, or both.
+
+----
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java
index a026d17..f0190f5 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchCluster.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import brooklyn.entity.group.DynamicCluster;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java
index dd2a7b4..da719dd 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterImpl.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import java.util.concurrent.atomic.AtomicInteger;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
index 718983a..76c20c8 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import brooklyn.config.ConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
index 327640f..976b05c 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import brooklyn.entity.basic.SoftwareProcessDriver;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
index e625aff..b6b244d 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
index 89e575e..d8cbb03 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import static java.lang.String.format;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
index 4ec0260..62d490c 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
index 25b9522..73a2f97 100644
--- a/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
+++ b/software/nosql/src/test/java/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
@@ -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.
+ */
package brooklyn.entity.nosql.elasticsearch;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/CatalogYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/CatalogYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/CatalogYamlTest.java
index f6486fc..48de5ed 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/CatalogYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/CatalogYamlTest.java
@@ -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.
+ */
package io.brooklyn.camp.brooklyn;
import static org.testng.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cd4bac7e/utils/test-support/src/main/java/brooklyn/test/PlatformTestSelectorListener.java
----------------------------------------------------------------------
diff --git a/utils/test-support/src/main/java/brooklyn/test/PlatformTestSelectorListener.java b/utils/test-support/src/main/java/brooklyn/test/PlatformTestSelectorListener.java
index 0b31781..3cc610d 100644
--- a/utils/test-support/src/main/java/brooklyn/test/PlatformTestSelectorListener.java
+++ b/utils/test-support/src/main/java/brooklyn/test/PlatformTestSelectorListener.java
@@ -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.
+ */
package brooklyn.test;
import org.testng.IInvokedMethod;
[2/6] git commit: Added apache headers, where missing
Posted by al...@apache.org.
Added apache headers, where missing
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f475a80f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f475a80f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f475a80f
Branch: refs/heads/master
Commit: f475a80f6827d2cdf798e85295cb9b49cbfac4cd
Parents: 836b429
Author: Martin Harris <gi...@nakomis.com>
Authored: Wed Jul 9 11:20:17 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Jul 15 10:37:53 2014 +0100
----------------------------------------------------------------------
camp/README.md | 17 +++++++++++++++++
camp/camp-base/notes.txt | 19 +++++++++++++++++++
camp/camp-base/pom.xml | 19 +++++++++++++++++++
.../src/main/resources/logback-custom.xml | 19 +++++++++++++++++++
.../camp/spi/pdp/pdp-single-artifact.yaml | 18 ++++++++++++++++++
.../camp/spi/pdp/pdp-single-service.yaml | 18 ++++++++++++++++++
.../pdp/yaml-sample-toy-interpreter-result.yaml | 18 ++++++++++++++++++
.../spi/pdp/yaml-sample-toy-interpreter.yaml | 18 ++++++++++++++++++
camp/camp-server/pom.xml | 20 ++++++++++++++++++++
camp/pom.xml | 18 ++++++++++++++++++
.../java/brooklyn/catalog/internal/catalog.md | 19 +++++++++++++++++++
.../util/internal/ssh/RecordingSshTool.java | 18 ++++++++++++++++++
.../camp/lite/test-app-service-blueprint.yaml | 18 ++++++++++++++++++
.../brooklyn/catalog/internal/osgi-catalog.xml | 20 ++++++++++++++++++++
.../BlobStorePersistencePerformanceTest.java | 18 ++++++++++++++++++
...tyToBlobStorePersistencePerformanceTest.java | 18 ++++++++++++++++++
usage/archetypes/quickstart/NOTES.txt | 18 ++++++++++++++++++
usage/camp/README.md | 17 +++++++++++++++++
18 files changed, 330 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/README.md
----------------------------------------------------------------------
diff --git a/camp/README.md b/camp/README.md
index db71dd5..a2d4a2f 100644
--- a/camp/README.md
+++ b/camp/README.md
@@ -15,3 +15,20 @@ other CAMP servers not based on Brooklyn, if desired.
These projects are part of the Apache Software Foundation Brooklyn project
(brooklyn.io) and released under the Apache License 2.0.
+----
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/notes.txt
----------------------------------------------------------------------
diff --git a/camp/camp-base/notes.txt b/camp/camp-base/notes.txt
index 7be3ba6..f18b5d3 100644
--- a/camp/camp-base/notes.txt
+++ b/camp/camp-base/notes.txt
@@ -62,3 +62,22 @@ TOSCA
Plan
END
+
+
+----
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 24f6a0c..b80ef0c 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/src/main/resources/logback-custom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/resources/logback-custom.xml b/camp/camp-base/src/main/resources/logback-custom.xml
index f7783a9..693977d 100644
--- a/camp/camp-base/src/main/resources/logback-custom.xml
+++ b/camp/camp-base/src/main/resources/logback-custom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<included>
<!-- include everything in this project at debug level -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-artifact.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-artifact.yaml b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-artifact.yaml
index 2cf4c80..0b4518b 100644
--- a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-artifact.yaml
+++ b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-artifact.yaml
@@ -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.
+#
name: sample
description: Tomcat sample JSP and servlet application.
origin: http://www.oracle.com/nCAMP/Hand
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-service.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-service.yaml b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-service.yaml
index d3dfb54..fe052d6 100644
--- a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-service.yaml
+++ b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/pdp-single-service.yaml
@@ -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.
+#
name: sample
description: Tomcat sample JSP and servlet application.
origin: http://www.oracle.com/nCAMP/Hand
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter-result.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter-result.yaml b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter-result.yaml
index d71059d..71b0ba8 100644
--- a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter-result.yaml
+++ b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter-result.yaml
@@ -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.
+#
keep: 1
mess:
a: bar
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter.yaml
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter.yaml b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter.yaml
index d90930f..8aa01d2 100644
--- a/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter.yaml
+++ b/camp/camp-base/src/test/resources/io/brooklyn/camp/spi/pdp/yaml-sample-toy-interpreter.yaml
@@ -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.
+#
$sample:ignore: 1
keep: 1
mess:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 7d4ca7f..7415155 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/camp/pom.xml
----------------------------------------------------------------------
diff --git a/camp/pom.xml b/camp/pom.xml
index 67e5c6b..b599eca 100644
--- a/camp/pom.xml
+++ b/camp/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/core/src/main/java/brooklyn/catalog/internal/catalog.md
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/catalog.md b/core/src/main/java/brooklyn/catalog/internal/catalog.md
index 3a7a180..2a001f2 100644
--- a/core/src/main/java/brooklyn/catalog/internal/catalog.md
+++ b/core/src/main/java/brooklyn/catalog/internal/catalog.md
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<catalog>
<name>My Local Catalog</name>
<!-- scan means it will load templates based on @CatalogTemplate annotations on entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java b/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
index 0aa2644..5608ea1 100644
--- a/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
+++ b/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
@@ -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.
+*/
package brooklyn.util.internal.ssh;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/core/src/test/resources/brooklyn/camp/lite/test-app-service-blueprint.yaml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/camp/lite/test-app-service-blueprint.yaml b/core/src/test/resources/brooklyn/camp/lite/test-app-service-blueprint.yaml
index ef83393..8740ca5 100644
--- a/core/src/test/resources/brooklyn/camp/lite/test-app-service-blueprint.yaml
+++ b/core/src/test/resources/brooklyn/camp/lite/test-app-service-blueprint.yaml
@@ -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.
+#
name: sample
description: Tomcat sample JSP and servlet application.
origin: http://www.oracle.com/nCAMP/Hand
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml b/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
index 6b40130..52a9764 100644
--- a/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
+++ b/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<catalog>
<name>OSGi catalogue</name>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java
index 8f7b479..6ae9190 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStorePersistencePerformanceTest.java
@@ -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.
+*/
package brooklyn.entity.rebind.persister.jclouds;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java
index 374e130..78c4545 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/EntityToBlobStorePersistencePerformanceTest.java
@@ -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.
+*/
package brooklyn.entity.rebind.persister.jclouds;
import org.testng.annotations.AfterMethod;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/usage/archetypes/quickstart/NOTES.txt
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/NOTES.txt b/usage/archetypes/quickstart/NOTES.txt
index b15e010..40d8395 100644
--- a/usage/archetypes/quickstart/NOTES.txt
+++ b/usage/archetypes/quickstart/NOTES.txt
@@ -56,3 +56,21 @@ To test a build:
References
* http://stackoverflow.com/questions/4082643/how-can-i-test-a-maven-archetype-that-ive-just-created/18916065#18916065
+
+----
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f475a80f/usage/camp/README.md
----------------------------------------------------------------------
diff --git a/usage/camp/README.md b/usage/camp/README.md
index 302bb6c..e0a112a 100644
--- a/usage/camp/README.md
+++ b/usage/camp/README.md
@@ -1,3 +1,20 @@
Depends on brooklyncentral/camp-server
+----
+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.
\ No newline at end of file
[6/6] git commit: This closes #49
Posted by al...@apache.org.
This closes #49
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a09ae7d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a09ae7d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a09ae7d4
Branch: refs/heads/master
Commit: a09ae7d49baeeaf984e615ceefaa8ed4c9990bf7
Parents: c0bd46d cd4bac7
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 15 16:17:42 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 15 16:17:42 2014 +0100
----------------------------------------------------------------------
.../BrooklynClassLoadingContext.java | 18 +++++
camp/README.md | 17 +++++
camp/camp-base/notes.txt | 19 +++++
camp/camp-base/pom.xml | 19 +++++
.../src/main/resources/logback-custom.xml | 19 +++++
.../camp/spi/pdp/pdp-single-artifact.yaml | 18 +++++
.../camp/spi/pdp/pdp-single-service.yaml | 18 +++++
.../pdp/yaml-sample-toy-interpreter-result.yaml | 18 +++++
.../spi/pdp/yaml-sample-toy-interpreter.yaml | 18 +++++
camp/camp-server/pom.xml | 20 ++++++
camp/pom.xml | 18 +++++
core/pom.xml | 16 +++++
.../java/brooklyn/catalog/internal/catalog.md | 19 +++++
.../AbstractBrooklynClassLoadingContext.java | 18 +++++
.../BrooklynClassLoadingContextSequential.java | 18 +++++
.../JavaBrooklynClassLoadingContext.java | 18 +++++
.../OsgiBrooklynClassLoadingContext.java | 18 +++++
.../src/test/dependencies/osgi/entities/pom.xml | 19 +++++
.../brooklyn/osgi/tests/SimpleApplication.java | 18 +++++
.../osgi/tests/SimpleApplicationImpl.java | 18 +++++
.../java/brooklyn/osgi/tests/SimpleEntity.java | 18 +++++
.../brooklyn/osgi/tests/SimpleEntityImpl.java | 18 +++++
.../util/internal/ssh/RecordingSshTool.java | 18 +++++
.../camp/lite/test-app-service-blueprint.yaml | 18 +++++
.../brooklyn/catalog/internal/osgi-catalog.xml | 20 ++++++
core/src/test/resources/brooklyn/osgi/README.md | 18 +++++
examples/pom.xml | 17 ++++-
examples/simple-messaging-pubsub/pom.xml | 15 ++++
.../BlobStorePersistencePerformanceTest.java | 18 +++++
...tyToBlobStorePersistencePerformanceTest.java | 18 +++++
pom.xml | 74 +++++++++++++++-----
sandbox/dropwizard/pom.xml | 4 +-
software/nosql/pom.xml | 20 +++++-
.../elasticsearch/ElasticSearchCluster.java | 18 +++++
.../elasticsearch/ElasticSearchClusterImpl.java | 18 +++++
.../nosql/elasticsearch/ElasticSearchNode.java | 18 +++++
.../elasticsearch/ElasticSearchNodeDriver.java | 18 +++++
.../elasticsearch/ElasticSearchNodeImpl.java | 18 +++++
.../ElasticSearchNodeSshDriver.java | 18 +++++
.../ElasticSearchClusterIntegrationTest.java | 18 +++++
.../ElasticSearchNodeIntegrationTest.java | 18 +++++
usage/archetypes/quickstart/NOTES.txt | 18 +++++
usage/archetypes/quickstart/pom.xml | 18 +++++
usage/camp/README.md | 17 +++++
.../brooklyn/camp/brooklyn/CatalogYamlTest.java | 18 +++++
usage/jsgui/pom.xml | 19 +++++
usage/qa/pom.xml | 14 ++++
.../test/PlatformTestSelectorListener.java | 18 +++++
48 files changed, 886 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: Added workaround for binary file being included in
check
Posted by al...@apache.org.
Added workaround for binary file being included in check
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2a7e7bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2a7e7bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2a7e7bf8
Branch: refs/heads/master
Commit: 2a7e7bf81be626e1474c94cc040194053b9caadf
Parents: 22955eb
Author: Martin Harris <gi...@nakomis.com>
Authored: Wed Jul 9 11:44:56 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Jul 15 10:37:54 2014 +0100
----------------------------------------------------------------------
software/nosql/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a7e7bf8/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index d1c6878..20ae22e 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -165,6 +165,8 @@
<excludes combine.children="append">
<exclude>**/couchdb/couch.uri</exclude>
<exclude>**/riak/vm.args</exclude>
+ <!-- In theory, binary files should be excluded, but for reasons unknown the example.tgz was being picked up as non-binary -->
+ <exclude>**/*.tgz</exclude>
</excludes>
</configuration>
</plugin>
[4/6] git commit: Moved rat exclusions into subproject poms
Posted by al...@apache.org.
Moved rat exclusions into subproject poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/22955eb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/22955eb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/22955eb1
Branch: refs/heads/master
Commit: 22955eb1795464e687154afab8f0eb300b71680e
Parents: f475a80
Author: Martin Harris <gi...@nakomis.com>
Authored: Wed Jul 9 11:22:38 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Tue Jul 15 10:37:54 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 16 ++++++++++++++
examples/pom.xml | 17 ++++++++++++++-
examples/simple-messaging-pubsub/pom.xml | 15 +++++++++++++
pom.xml | 31 ++++++---------------------
sandbox/dropwizard/pom.xml | 4 ++--
software/nosql/pom.xml | 18 +++++++++++++++-
usage/archetypes/quickstart/pom.xml | 18 ++++++++++++++++
usage/jsgui/pom.xml | 19 ++++++++++++++++
usage/qa/pom.xml | 14 ++++++++++++
9 files changed, 123 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 5c292de..15406b9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -187,6 +187,22 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/resources/brooklyn/location/geo/external-ip-address-resolvers.txt</exclude>
+ <!-- FIXME: Maxmind code to be removed due to licence, see https://issues.apache.org/jira/browse/BROOKLYN-32-->
+ <exclude>**/src/3rd/maxmind/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 0e54c6c..63c709c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -56,5 +56,20 @@
<module>simple-messaging-pubsub</module>
<module>simple-nosql-cluster</module>
</modules>
-
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index 236ab92..ec43750 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -121,5 +121,20 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/resources/passwd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dad8570..f9f0270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -740,36 +740,17 @@
<exclude>**/*.key.org</exclude>
<exclude>**/*.psd</exclude>
<exclude>**/*.json</exclude>
- <exclude>**/target/classes/**</exclude>
+ <exclude>**/*.plxarc</exclude>
+ <exclude>**/services/brooklyn.location.LocationResolver</exclude>
+ <exclude>**/src/test/resources/brooklyn/entity/basic/template_with_extra_substitutions.txt</exclude>
+ <exclude>**/src/main/resources/banner.txt</exclude>
<exclude>**/src/test/resources/ssl/certs/localhost/info.txt</exclude>
<exclude>**/sandbox/examples/src/main/scripts/amis.txt</exclude>
+ <exclude>**/sandbox/*/target/classes/**</exclude>
+ <exclude>**/sandbox/*/target/test-classes/**</exclude>
<!-- see notes in https://issues.apache.org/jira/browse/BROOKLYN-18 -->
- <!-- TODO: Once reviewed and accepted, these entries should be moved into the subproject's pom.xml file -->
- <!-- the have been grouped here for easier review -->
- <exclude>**/dropwizard/src/main/resources/banner.txt</exclude>
- <exclude>**/services/brooklyn.location.LocationResolver</exclude>
- <exclude>**/src/main/resources/brooklyn/location/geo/external-ip-address-resolvers.txt</exclude>
- <exclude>**/src/test/resources/brooklyn/entity/basic/template_with_extra_substitutions.txt</exclude>
- <exclude>**/src/main/resources/brooklyn/entity/nosql/couchdb/couch.uri</exclude>
- <exclude>**/src/main/resources/brooklyn/entity/nosql/riak/vm.args</exclude>
- <!-- brooklyn-jsgui -->
- <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
- <exclude>**/src/main/dev/info.txt</exclude>
- <exclude>**/src/main/dev/js/libs/*</exclude>
- <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
- <exclude>**/src/test/javascript/config.txt</exclude>
- <!-- brooklyn-archetype-quickstart -->
- <exclude>**/src/test/resources/projects/integration-test-1/goal.txt</exclude>
- <!-- brooklyn-examples-parent -->
- <exclude>**/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom</exclude>
- <!-- simple-messaging-pubsub -->
- <exclude>**/src/main/resources/passwd</exclude>
- <!-- brooklyn-qa -->
- <exclude>**/log-exclusions.txt</exclude>
<!-- FIXME: Check licences for docs -->
<exclude>docs/**</exclude>
- <!-- FIXME: Maxmind code to be removed due to licence, see https://issues.apache.org/jira/browse/BROOKLYN-32-->
- <exclude>**/src/3rd/maxmind/**</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/sandbox/dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/pom.xml b/sandbox/dropwizard/pom.xml
index 59ad10f..3a234e8 100644
--- a/sandbox/dropwizard/pom.xml
+++ b/sandbox/dropwizard/pom.xml
@@ -226,6 +226,6 @@
</archive>
</configuration>
</plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index bfc1a07..d1c6878 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -154,5 +154,21 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/couchdb/couch.uri</exclude>
+ <exclude>**/riak/vm.args</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 0dacf16..ec356fc 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -194,6 +194,24 @@
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/resources/archetype-resources/README.md</exclude>
+ <exclude>**/src/brooklyn-sample/README.md</exclude>
+ <exclude>**/src/test/resources/projects/integration-test-1/reference/README.md</exclude>
+ <exclude>**/src/test/resources/projects/integration-test-1/goal.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 31c3548..18adfb3 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -178,6 +178,25 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/webapp/assets/js/libs/*</exclude>
+ <exclude>**/src/main/dev/info.txt</exclude>
+ <exclude>**/src/main/dev/js/libs/*</exclude>
+ <exclude>**/src/build/requirejs-maven-plugin/r.js</exclude>
+ <exclude>**/src/test/javascript/config.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22955eb1/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 279cb4f..6c97f01 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -75,6 +75,20 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/log-exclusions.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>