You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/07 21:27:23 UTC
svn commit: r634805 - in /geronimo/plugins/roller/trunk: ./ roller-jetty/
roller-jetty/src/main/resources/config/ roller-themes/
roller-themes/src/main/resources/themes/basic/
roller-themes/src/main/resources/themes/glike/ roller-tomcat/
roller-tomcat/...
Author: djencks
Date: Fri Mar 7 12:27:18 2008
New Revision: 634805
URL: http://svn.apache.org/viewvc?rev=634805&view=rev
Log:
remove non-published dependencies, adapt to newer genesis-1.4, add license headers where needed
Removed:
geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.vm
geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.vm
Modified:
geronimo/plugins/roller/trunk/pom.xml
geronimo/plugins/roller/trunk/roller-jetty-commands
geronimo/plugins/roller/trunk/roller-jetty/pom.xml
geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties
geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties
geronimo/plugins/roller/trunk/roller-themes/LICENSE.txt
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/_day.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/basic-custom.css
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/permalink.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/searchresults.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/sidebar.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/theme.xml
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/weblog.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/_day.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/glike-custom.css
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/permalink.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/searchresults.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/sidebar.vm
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/slask.txt
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/theme.xml
geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/weblog.vm
geronimo/plugins/roller/trunk/roller-tomcat-commands
geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties
geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties
geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
Modified: geronimo/plugins/roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/pom.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/pom.xml (original)
+++ geronimo/plugins/roller/trunk/pom.xml Fri Mar 7 12:27:18 2008
@@ -43,7 +43,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
<geronimoVersion>2.1</geronimoVersion>
- <rollerPluginVersion>1.0</rollerPluginVersion>
+ <rollerPluginVersion>1.0-SNAPSHOT</rollerPluginVersion>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -296,7 +296,7 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
+ <groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
@@ -397,12 +397,6 @@
</dependency>
<dependency>
- <groupId>apache-xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>j_2.7.0</version>
- </dependency>
-
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
@@ -572,25 +566,8 @@
<module>roller-themes</module>
<module>roller-jetty</module>
<module>roller-tomcat</module>
- <!--<module>geronimo-jetty-roller</module>-->
- <!--<module>geronimo-tomcat-roller</module>-->
</modules>
<profiles>
- <profile>
- <id>release</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/geronimo/plugins/roller/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>with-assembly</id>
Modified: geronimo/plugins/roller/trunk/roller-jetty-commands
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty-commands?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty-commands (original)
+++ geronimo/plugins/roller/trunk/roller-jetty-commands Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev: $ $Date: $
+# --------------------------------------------------------------------
+
# assembles a server containing roller-jetty from the geronimo-framework server.
# run using ./bin/gsh < roller-jetty-commands
deploy/list-plugins -u system -w manager -r file:/Users/david/.m2/repository/ org.apache.geronimo.plugins/roller-jetty/0.0.2-SNAPSHOT/car org.apache.geronimo.plugins/roller-themes/0.0.2-SNAPSHOT/car
Modified: geronimo/plugins/roller/trunk/roller-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/pom.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/pom.xml Fri Mar 7 12:27:18 2008
@@ -185,7 +185,7 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
+ <groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
@@ -264,11 +264,6 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- </dependency>
-
- <dependency>
- <groupId>apache-xalan</groupId>
- <artifactId>serializer</artifactId>
</dependency>
<dependency>
Modified: geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/planet-custom.properties Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
# Values of the properties in this list get system property expansion
# applied to them when loaded.
# Adding properties here makes it possible to place stuff in server var dir.
Modified: geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-jetty/src/main/resources/config/roller-custom.properties Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
# Values of the properties in this list get system property expansion
# applied to them when loaded.
# The themes.dir property is added to make it possible for geronimo to
Modified: geronimo/plugins/roller/trunk/roller-themes/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/LICENSE.txt?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/LICENSE.txt (original)
+++ geronimo/plugins/roller/trunk/roller-themes/LICENSE.txt Fri Mar 7 12:27:18 2008
@@ -474,3 +474,24 @@
created by Jason Hunter <jhunter AT jdom DOT org> and
Brett McLaughlin <brett AT jdom DOT org>. For more information on
the JDOM Project, please see <http://www.jdom.org/>.
+
+-------------------------------------------------------------------------------
+roller-themes/src/main/resources/themes/glike/ricoAjax/prototype.js
+-------------------------------------------------------------------------------
+
+Copyright (c) 2005 Sam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/_day.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/_day.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/_day.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/_day.vm Fri Mar 7 12:27:18 2008
@@ -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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<div class="dayBox">
<div class="dayTitle">
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/basic-custom.css
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/basic-custom.css?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/basic-custom.css (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/basic-custom.css Fri Mar 7 12:27:18 2008
@@ -1,3 +1,23 @@
+/*
+ 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.
+*/
+
+/* $Rev$ $Date$ */
/*-------------------------------------------------------------
Base styles
--------------------------------------------------------------*/
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/permalink.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/permalink.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/permalink.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/permalink.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/searchresults.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/searchresults.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/searchresults.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/searchresults.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/sidebar.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/sidebar.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/sidebar.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/sidebar.vm Fri Mar 7 12:27:18 2008
@@ -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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
+
## sidebar contents
<h2>Calendar</h2>
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/theme.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/theme.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/theme.xml (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/theme.xml Fri Mar 7 12:27:18 2008
@@ -1,4 +1,24 @@
<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
<weblogtheme>
<id>basic</id>
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/weblog.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/weblog.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/weblog.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/basic/weblog.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/_day.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/_day.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/_day.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/_day.vm Fri Mar 7 12:27:18 2008
@@ -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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<div class="dayBox">
<div class="dayTitle">
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/glike-custom.css
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/glike-custom.css?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/glike-custom.css (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/glike-custom.css Fri Mar 7 12:27:18 2008
@@ -1,3 +1,23 @@
+/*
+ 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.
+*/
+
+/* $Rev$ $Date$ */
/*-------------------------------------------------------------
Base styles
--------------------------------------------------------------*/
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/permalink.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/permalink.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/permalink.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/permalink.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/searchresults.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/searchresults.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/searchresults.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/searchresults.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/sidebar.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/sidebar.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/sidebar.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/sidebar.vm Fri Mar 7 12:27:18 2008
@@ -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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
## sidebar contents
<h2>Calendar</h2>
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/slask.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/slask.txt?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/slask.txt (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/slask.txt Fri Mar 7 12:27:18 2008
@@ -1,6 +1,23 @@
/*
- * $Id: default.css 522548 2007-03-26 15:36:28Z hcunico $
- */
+ 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.
+*/
+
+/* $Rev$ $Date$ */
body, p, td, table, tr, .bodytext, .stepfield {
font-family: Verdana, arial, sans-serif;
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/theme.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/theme.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/theme.xml (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/theme.xml Fri Mar 7 12:27:18 2008
@@ -1,4 +1,24 @@
<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
<weblogtheme>
<id>glike</id>
Modified: geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/weblog.vm
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/weblog.vm?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/weblog.vm (original)
+++ geronimo/plugins/roller/trunk/roller-themes/src/main/resources/themes/glike/weblog.vm Fri Mar 7 12:27:18 2008
@@ -1,4 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+## 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.
+
+## --------------------------------------------------------------------
+## $Rev: $ $Date: $
+## --------------------------------------------------------------------
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Modified: geronimo/plugins/roller/trunk/roller-tomcat-commands
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat-commands?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat-commands (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat-commands Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev: $ $Date: $
+# --------------------------------------------------------------------
+
# assembles a server containing roller-tomcat from the geronimo-framework server.
# run using ./bin/gsh < roller-tomcat-commands
deploy/list-plugins -u system -w manager -r file:/Users/david/.m2/repository/ org.apache.geronimo.plugins/roller-tomcat/0.0.2-SNAPSHOT/car org.apache.geronimo.plugins/roller-themes/0.0.2-SNAPSHOT/car
Modified: geronimo/plugins/roller/trunk/roller-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/pom.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/pom.xml Fri Mar 7 12:27:18 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
@@ -186,7 +186,7 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
+ <groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
@@ -265,11 +265,6 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- </dependency>
-
- <dependency>
- <groupId>apache-xalan</groupId>
- <artifactId>serializer</artifactId>
</dependency>
<dependency>
Modified: geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/planet-custom.properties Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
# Values of the properties in this list get system property expansion
# applied to them when loaded.
# Adding properties here makes it possible to place stuff in server var dir.
Modified: geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties (original)
+++ geronimo/plugins/roller/trunk/roller-tomcat/src/main/resources/config/roller-custom.properties Fri Mar 7 12:27:18 2008
@@ -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.
+
+# --------------------------------------------------------------------
+# $Rev$ $Date$
+# --------------------------------------------------------------------
+
# Values of the properties in this list get system property expansion
# applied to them when loaded.
# The themes.dir property is added to make it possible for geronimo to
Modified: geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml?rev=634805&r1=634804&r2=634805&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml (original)
+++ geronimo/plugins/roller/trunk/roller-weblogger-geronimo/pom.xml Fri Mar 7 12:27:18 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0"?>
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
<project>
<parent>
<artifactId>roller-parent</artifactId>