You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/03 03:54:13 UTC
[28/30] git commit: License header updates.
License header updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/42ef767c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/42ef767c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/42ef767c
Branch: refs/heads/vpc
Commit: 42ef767c4a5a0824bb2234e1dc5117eab8c92baa
Parents: 9c127cf
Author: Chip Childers <ch...@gmail.com>
Authored: Thu Aug 2 09:13:42 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Thu Aug 2 09:16:16 2012 -0400
----------------------------------------------------------------------
cloud.spec | 17 ++++++++++++
console-proxy/.classpath | 18 +++++++++++++
console-proxy/.project | 18 +++++++++++++
console-proxy/conf.dom0/consoleproxy.properties.in | 17 ++++++++++++
console-proxy/conf.dom0/log4j-cloud.xml.in | 18 +++++++++++++
console-proxy/conf/agent.properties | 17 ++++++++++++
console-proxy/conf/consoleproxy.properties | 17 ++++++++++++
console-proxy/conf/log4j-cloud.xml | 18 +++++++++++++
console-proxy/scripts/run.bat | 17 ++++++++++++
console-proxy/ui/viewer-update.ftl | 20 ++++++++++++++-
10 files changed, 176 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index abb79bb..28401a6 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -1,3 +1,20 @@
+# 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.
+
%define __os_install_post %{nil}
%global debug_package %{nil}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/.classpath
----------------------------------------------------------------------
diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index c87c7cd..1a61b02 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -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.
+-->
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/.project
----------------------------------------------------------------------
diff --git a/console-proxy/.project b/console-proxy/.project
index 414fed8..d3efcb5 100644
--- a/console-proxy/.project
+++ b/console-proxy/.project
@@ -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.
+-->
<projectDescription>
<name>console-proxy</name>
<comment></comment>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/conf.dom0/consoleproxy.properties.in
----------------------------------------------------------------------
diff --git a/console-proxy/conf.dom0/consoleproxy.properties.in b/console-proxy/conf.dom0/consoleproxy.properties.in
index 743db37..858ef44 100644
--- a/console-proxy/conf.dom0/consoleproxy.properties.in
+++ b/console-proxy/conf.dom0/consoleproxy.properties.in
@@ -1,3 +1,20 @@
+# 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.
+
consoleproxy.tcpListenPort=0
consoleproxy.httpListenPort=80
consoleproxy.httpCmdListenPort=8001
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/conf.dom0/log4j-cloud.xml.in
----------------------------------------------------------------------
diff --git a/console-proxy/conf.dom0/log4j-cloud.xml.in b/console-proxy/conf.dom0/log4j-cloud.xml.in
index bff32e3..dde844f 100644
--- a/console-proxy/conf.dom0/log4j-cloud.xml.in
+++ b/console-proxy/conf.dom0/log4j-cloud.xml.in
@@ -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.
+-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/conf/agent.properties
----------------------------------------------------------------------
diff --git a/console-proxy/conf/agent.properties b/console-proxy/conf/agent.properties
index 137688c..11853ba 100644
--- a/console-proxy/conf/agent.properties
+++ b/console-proxy/conf/agent.properties
@@ -1,2 +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.
+
instance=ConsoleProxy
resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/conf/consoleproxy.properties
----------------------------------------------------------------------
diff --git a/console-proxy/conf/consoleproxy.properties b/console-proxy/conf/consoleproxy.properties
index 3467704..3e5f69a 100644
--- a/console-proxy/conf/consoleproxy.properties
+++ b/console-proxy/conf/consoleproxy.properties
@@ -1,3 +1,20 @@
+# 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.
+
consoleproxy.tcpListenPort=0
consoleproxy.httpListenPort=8088
consoleproxy.httpCmdListenPort=8001
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/conf/log4j-cloud.xml
----------------------------------------------------------------------
diff --git a/console-proxy/conf/log4j-cloud.xml b/console-proxy/conf/log4j-cloud.xml
index 7e455c1..5b31c9d 100644
--- a/console-proxy/conf/log4j-cloud.xml
+++ b/console-proxy/conf/log4j-cloud.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.
+-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/scripts/run.bat
----------------------------------------------------------------------
diff --git a/console-proxy/scripts/run.bat b/console-proxy/scripts/run.bat
index e5fab0d..39655f9 100644
--- a/console-proxy/scripts/run.bat
+++ b/console-proxy/scripts/run.bat
@@ -1 +1,18 @@
+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.
+
java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %*
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42ef767c/console-proxy/ui/viewer-update.ftl
----------------------------------------------------------------------
diff --git a/console-proxy/ui/viewer-update.ftl b/console-proxy/ui/viewer-update.ftl
index 2217a13..ab3d4d1 100644
--- a/console-proxy/ui/viewer-update.ftl
+++ b/console-proxy/ui/viewer-update.ftl
@@ -1,6 +1,24 @@
+<#--
+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.
+-->
tileMap = [ ${tileSequence} ];
<#if resized == true>
ajaxViewer.resize('main_panel', ${width}, ${height}, ${tileWidth}, ${tileHeight});
</#if>
ajaxViewer.refresh('${imgUrl}', tileMap, false);
-
\ No newline at end of file
+