Notice that velocity comments are being used. Regards, Hiram
Blog: http://hiramchirino.com Open Source SOA http://fusesource.com/ On Mon, Sep 20, 2010 at 10:04 AM, Guillaume Nodet <[email protected]> wrote: > I'm not sure that headers should be added on code that will be > generated by users ... > The code should be fully owned by them i think. > > On Mon, Sep 20, 2010 at 15:55, <[email protected]> wrote: >> Author: chirino >> Date: Mon Sep 20 13:55:57 2010 >> New Revision: 998930 >> >> URL: http://svn.apache.org/viewvc?rev=998930&view=rev >> Log: >> merged rev 998908 from trunk to fix missing lic headers >> >> Modified: >> karaf/branches/karaf-2.1.x/ (props changed) >> karaf/branches/karaf-2.1.x/archetypes/command/pom.xml >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/META-INF/maven/archetype-metadata.xml >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/java/__command__.java >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-log.xml >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java >> >> karaf/branches/karaf-2.1.x/archetypes/command/src/test/resources/projects/basic/archetype.properties >> karaf/branches/karaf-2.1.x/archetypes/itests/pom.xml >> >> karaf/branches/karaf-2.1.x/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> >> karaf/branches/karaf-2.1.x/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> karaf/branches/karaf-2.1.x/util/src/test/resources/test.properties >> >> Propchange: karaf/branches/karaf-2.1.x/ >> ------------------------------------------------------------------------------ >> svn:mergeinfo = /karaf/trunk:998908 >> >> Modified: karaf/branches/karaf-2.1.x/archetypes/command/pom.xml >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/pom.xml?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- karaf/branches/karaf-2.1.x/archetypes/command/pom.xml (original) >> +++ karaf/branches/karaf-2.1.x/archetypes/command/pom.xml Mon Sep 20 >> 13:55:57 2010 >> @@ -1,4 +1,20 @@ >> <?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> >> >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/META-INF/maven/archetype-metadata.xml >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/META-INF/maven/archetype-metadata.xml >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/META-INF/maven/archetype-metadata.xml >> Mon Sep 20 13:55:57 2010 >> @@ -1,4 +1,20 @@ >> <?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. >> +--> >> <archetype-descriptor >> xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 >> http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; >> name="org.apache.karaf.archetypes.command" >> >> xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"; >> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml >> Mon Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> <?xml version="1.0" encoding="UTF-8"?> >> <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> >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/java/__command__.java >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/java/__command__.java?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/java/__command__.java >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/java/__command__.java >> Mon Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> #set( $symbol_pound = '#' ) >> #set( $symbol_dollar = '$' ) >> #set( $symbol_escape = '\' ) >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-log.xml >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-log.xml >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-log.xml >> Mon Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> #set( $symbol_pound = '#' ) >> #set( $symbol_dollar = '$' ) >> #set( $symbol_escape = '\' ) >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/src/test/java/__command__Test.java >> Mon Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> #set( $symbol_pound = '#' ) >> #set( $symbol_dollar = '$' ) >> #set( $symbol_escape = '\' ) >> >> Modified: >> karaf/branches/karaf-2.1.x/archetypes/command/src/test/resources/projects/basic/archetype.properties >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/test/resources/projects/basic/archetype.properties?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/archetypes/command/src/test/resources/projects/basic/archetype.properties >> (original) >> +++ >> karaf/branches/karaf-2.1.x/archetypes/command/src/test/resources/projects/basic/archetype.properties >> Mon Sep 20 13:55:57 2010 >> @@ -1,4 +1,19 @@ >> -#Mon Jul 19 10:12:55 EEST 2010 >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> version=0.1-SNAPSHOT >> groupId=archetype.it >> artifactId=basic >> >> Modified: karaf/branches/karaf-2.1.x/archetypes/itests/pom.xml >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/itests/pom.xml?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- karaf/branches/karaf-2.1.x/archetypes/itests/pom.xml (original) >> +++ karaf/branches/karaf-2.1.x/archetypes/itests/pom.xml Mon Sep 20 13:55:57 >> 2010 >> @@ -1,4 +1,20 @@ >> <?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> >> <modelVersion>4.0.0</modelVersion> >> <parent> >> >> Modified: >> karaf/branches/karaf-2.1.x/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> (original) >> +++ >> karaf/branches/karaf-2.1.x/shell/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> Mon Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> org.apache.karaf.shell.commands.CatAction >> org.apache.karaf.shell.commands.ClearAction >> org.apache.karaf.shell.commands.EachAction >> >> Modified: >> karaf/branches/karaf-2.1.x/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- >> karaf/branches/karaf-2.1.x/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> (original) >> +++ >> karaf/branches/karaf-2.1.x/shell/console/src/main/resources/META-INF/services/org/apache/karaf/shell/commands >> Mon Sep 20 13:55:57 2010 >> @@ -1 +1,17 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> org.apache.karaf.shell.console.HelpAction >> >> Modified: karaf/branches/karaf-2.1.x/util/src/test/resources/test.properties >> URL: >> http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/util/src/test/resources/test.properties?rev=998930&r1=998929&r2=998930&view=diff >> ============================================================================== >> --- karaf/branches/karaf-2.1.x/util/src/test/resources/test.properties >> (original) >> +++ karaf/branches/karaf-2.1.x/util/src/test/resources/test.properties Mon >> Sep 20 13:55:57 2010 >> @@ -1,3 +1,19 @@ >> +##--------------------------------------------------------------------------- >> +## 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. >> +##--------------------------------------------------------------------------- >> # >> # test.properties >> # Used in the PropertiesTest >> >> >> > > > > -- > Cheers, > Guillaume Nodet > ------------------------ > Blog: http://gnodet.blogspot.com/ > ------------------------ > Open Source SOA > http://fusesource.com >
