You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2007/07/25 21:41:08 UTC
svn commit: r559573 - in /james/server/trunk/phoenix-deployment/phoenix-bin:
bin/james-server.sh bin/phoenix.sh bin/run.bat bin/run.sh conf/kernel.xml
conf/phoenix-service.xml conf/wrapper.conf
Author: rdonkin
Date: Wed Jul 25 12:41:07 2007
New Revision: 559573
URL: http://svn.apache.org/viewvc?view=rev&rev=559573
Log:
Added missing license headers
Modified:
james/server/trunk/phoenix-deployment/phoenix-bin/bin/james-server.sh
james/server/trunk/phoenix-deployment/phoenix-bin/bin/phoenix.sh
james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.bat
james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.sh
james/server/trunk/phoenix-deployment/phoenix-bin/conf/kernel.xml
james/server/trunk/phoenix-deployment/phoenix-bin/conf/phoenix-service.xml
james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/bin/james-server.sh
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/bin/james-server.sh?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/bin/james-server.sh (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/bin/james-server.sh Wed Jul 25 12:41:07 2007
@@ -1,4 +1,22 @@
#! /bin/sh
+################################################################
+# 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. #
+################################################################
#
# -----------------------------------------------------------------------------
# Phoenix start script.
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/bin/phoenix.sh
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/bin/phoenix.sh?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/bin/phoenix.sh (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/bin/phoenix.sh Wed Jul 25 12:41:07 2007
@@ -1,4 +1,22 @@
#! /bin/sh
+################################################################
+# 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. #
+################################################################
#
# -----------------------------------------------------------------------------
# Phoenix start script.
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.bat
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.bat?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.bat (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.bat Wed Jul 25 12:41:07 2007
@@ -1,5 +1,23 @@
@echo off
rem
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements. See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership. The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied. See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+rem
+rem
rem Phoenix start script.
rem
rem Author: Peter Donald [donaldp@apache.org]
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.sh
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.sh?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.sh (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/bin/run.sh Wed Jul 25 12:41:07 2007
@@ -1,4 +1,22 @@
#! /bin/sh
+################################################################
+# 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. #
+################################################################
#
# -----------------------------------------------------------------------------
# Phoenix start script.
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/conf/kernel.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/conf/kernel.xml?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/conf/kernel.xml (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/conf/kernel.xml Wed Jul 25 12:41:07 2007
@@ -1,5 +1,22 @@
<?xml version="1.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.
+-->
<phoenix>
<embeddor role="org.apache.avalon.phoenix.interfaces.Embeddor"
class="org.apache.avalon.phoenix.components.embeddor.DefaultEmbeddor">
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/conf/phoenix-service.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/conf/phoenix-service.xml?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/conf/phoenix-service.xml (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/conf/phoenix-service.xml Wed Jul 25 12:41:07 2007
@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE server>
-<!-- JBoss Service configuration file -->
+<!--
+ 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.
+-->
<!-- ===================================================================== -->
<!-- -->
<!-- Phoenix Launcher Service Configuration -->
Modified: james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf?view=diff&rev=559573&r1=559572&r2=559573
==============================================================================
--- james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf (original)
+++ james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf Wed Jul 25 12:41:07 2007
@@ -1,3 +1,22 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+################################################################
+#
#********************************************************************
# Wrapper Properties
#********************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r559573 - in /james/server/trunk/phoenix-deployment/phoenix-bin: bin/james-server.sh bin/phoenix.sh bin/run.bat bin/run.sh conf/kernel.xml conf/phoenix-service.xml conf/wrapper.conf
Posted by Robert Burrell Donkin <ro...@gmail.com>.
On 7/25/07, Stefano Bagnara <ap...@bago.org> wrote:
> I guess wrapper.conf is the configuration file for the wrapper, which
> license and copyright is described in Wrapper.LICENSE.
good catch 8-)
thanks
> Does the fact that we took a Wrapper conf file and changed the property
> values means that we added Intellectual value to the file?
depends on the nature of the changes: were they creative enough? in
this case, it's tough to be certain.
in the case of uncertain, IMHO the best approach is to be clear about
our intentions: apache intends that the apache license is used for
it's works. WRAPPER.license allows sub-licensing (which is what we
have done). if the JAMES changes were not creative enough to be
copyrightable then a user can simply use the original license (if they
prefer). however, if they were creative enough to be copyrightable and
a header was not added then users would need to rely on an implied
license.
so on balance, it's best to err on the side of caution and give it
have a header.
- robert
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r559573 - in /james/server/trunk/phoenix-deployment/phoenix-bin:
bin/james-server.sh bin/phoenix.sh bin/run.bat bin/run.sh conf/kernel.xml
conf/phoenix-service.xml conf/wrapper.conf
Posted by Stefano Bagnara <ap...@bago.org>.
I guess wrapper.conf is the configuration file for the wrapper, which
license and copyright is described in Wrapper.LICENSE.
Does the fact that we took a Wrapper conf file and changed the property
values means that we added Intellectual value to the file?
Stefano
rdonkin@apache.org ha scritto:
> Modified: james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf
> URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf?view=diff&rev=559573&r1=559572&r2=559573
> ==============================================================================
> --- james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf (original)
> +++ james/server/trunk/phoenix-deployment/phoenix-bin/conf/wrapper.conf Wed Jul 25 12:41:07 2007
> @@ -1,3 +1,22 @@
> +################################################################
> +# Licensed to the Apache Software Foundation (ASF) under one #
> +# or more contributor license agreements. See the NOTICE file #
> +# distributed with this work for additional information #
> +# regarding copyright ownership. The ASF licenses this file #
> +# to you under the Apache License, Version 2.0 (the #
> +# "License"); you may not use this file except in compliance #
> +# with the License. You may obtain a copy of the License at #
> +# #
> +# http://www.apache.org/licenses/LICENSE-2.0 #
> +# #
> +# Unless required by applicable law or agreed to in writing, #
> +# software distributed under the License is distributed on an #
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
> +# KIND, either express or implied. See the License for the #
> +# specific language governing permissions and limitations #
> +# under the License. #
> +################################################################
> +#
> #********************************************************************
> # Wrapper Properties
> #********************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org