Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 14 additions & 14 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ LICENSE.txt - Roller licensing terms

Roller is licensed under the Apache License Version 2.0, see below.

Roller also uses the JDOM XML parser library, licensed under the
Roller also uses the JDOM XML parser library, licensed under the
terms of the JDOM license (a BSD-like license listed at end of this file).

And Roller contains some snippets of code from the Blojsom and Pebble
blog servers, which are both licensed under the terms of the BSD license
blog servers, which are both licensed under the terms of the BSD license
(http://www.opensource.org/licenses/bsd-license.php).


Expand Down Expand Up @@ -219,33 +219,33 @@ blog servers, which are both licensed under the terms of the BSD license
The JDOM License
Copyright (C) 2000-2002 Jason Hunter & Brett McLaughlin.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions, and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions, and the disclaimer that follows
these conditions in the documentation and/or other materials
notice, this list of conditions, and the disclaimer that follows
these conditions in the documentation and/or other materials
provided with the distribution.

3. The name "JDOM" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact <license AT jdom DOT org>.

4. Products derived from this software may not be called "JDOM", nor
may "JDOM" appear in their name, without prior written permission
from the JDOM Project Management <pm AT jdom DOT org>.
In addition, we request (but do not require) that you include in the
end-user documentation provided with the redistribution and/or in the

In addition, we request (but do not require) that you include in the
end-user documentation provided with the redistribution and/or in the
software itself an acknowledgement equivalent to the following:
"This product includes software developed by the
JDOM Project (http://www.jdom.org/)."
Alternatively, the acknowledgment may be graphical using the logos
Alternatively, the acknowledgment may be graphical using the logos
available at http://www.jdom.org/images/logos.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
Expand All @@ -261,8 +261,8 @@ blog servers, which are both licensed under the terms of the BSD license
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

This software consists of voluntary contributions made by many
individuals on behalf of the JDOM Project and was originally
This software consists of voluntary contributions made by many
individuals on behalf of the JDOM Project and was originally
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/>.
14 changes: 7 additions & 7 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ COPYRIGHT NOTICES

This product includes:

* Software developed by the Apache Software Foundation (http://www.apache.org)
Copyright 2006 The Apache Software Foundation.
* Software developed by the Apache Software Foundation (http://www.apache.org)
Copyright 2006 The Apache Software Foundation.

* Software developed by the ROME project
Copyright 2003-2006 Sun Microsystems, Inc.
Expand All @@ -20,7 +20,7 @@ This product includes:
* Snippets of code from the Pebble blog server
Copyright 2003 Simon Brown, All rights reserved.

* Code written by Sun Microsystems, Inc.
* Code written by Sun Microsystems, Inc.
Copyright 2005 Sun Microsystems, Inc.

* Code written by Dave Johnson for RSS and Atom in Action
Expand All @@ -30,7 +30,7 @@ This product includes:
Copyright 2002-2003 by OpenSymphony

* A Struts LinkTag and LinkParamTag by BSquare Software
Copyright 2001 Bsquare Projects
Copyright 2001 Bsquare Projects

* The Xinha WYSIWYG editor, which includes HTMLArea
Copyright dynarch.com, 2003-2004
Expand All @@ -52,11 +52,11 @@ OTHER NOTICES

CREDITS

Roller committers (in chronological order):
Roller committers (in chronological order):

David M Johnson
Lance Lanvandowska
Matt Raible
Lance Lanvandowska
Matt Raible
Mindaguas Idzelis (retired)
Jaap Van Der Molen (retired)
Anil Gangolli
Expand Down
26 changes: 13 additions & 13 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ indicated above, the following command will build and run all unit tests:
mvn install

After doing that, you should find the newly built Roller webapp, suitable
for use with Tomcat in weblogger-web/target/roller.
for use with Tomcat in weblogger-web/target/roller.

To build Roller release files, you do this:

Expand All @@ -47,7 +47,7 @@ To build Roller release files, you do this:
mvn -Dtomcat=true install
cd ..

After that, you'll find Roller distribution files in weblogger-assembly/target.
After that, you'll find Roller distribution files in weblogger-assembly/target.
The Tomcat specific release files will have 'for-tomcat' in their names.

See the script build-tomcat-release.sh to see the sequence of commands used
Expand All @@ -58,11 +58,11 @@ to create Roller releases for Tomcat.
BUILDING FOR JAVA EE 6

The Tomcat build includes extra things that are not needed on a full Java EE
application server. In fact, the Tomcat release won't work on some Java EE
servers. If we leave those extra things out, Roller can run on most Java EE
application server. In fact, the Tomcat release won't work on some Java EE
servers. If we leave those extra things out, Roller can run on most Java EE
servers.

If you add a 'javaee' flag to the Roller build invocation, you can create
If you add a 'javaee' flag to the Roller build invocation, you can create
Roller release files that will work on a Java EE 6 app server.

mvn clean
Expand All @@ -76,10 +76,10 @@ Roller release files that will work on a Java EE 6 app server.
mvn -Djavaee=true install
cd ..

When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
'for-javaee' in their names.

See the script build-javaee-release.sh to see the sequence of commands used
to create Roller releases for Java EE.

Expand All @@ -88,7 +88,7 @@ to create Roller releases for Java EE.
BUILDING FOR JBOSS 6

JBoss 6 is a Java EE server, but due to differences in JNDI naming, it needs
a separate build. If you add a 'jboss' flag to the Roller build invocation,
a separate build. If you add a 'jboss' flag to the Roller build invocation,
you can create Roller release files that will work on a JBoss 6 app server.

mvn clean
Expand All @@ -102,10 +102,10 @@ you can create Roller release files that will work on a JBoss 6 app server.
mvn -Djboss=true install
cd ..

When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
When that finishes, you will find Roller distribution files in
weblogger-assembly/target. The Java EE specific release files will have
'for-jboss' in their names.

See the script build-jbossee-release.sh to see the sequence of commands used
to create Roller releases for JBoss.

Expand All @@ -115,7 +115,7 @@ NOTES

1) Set MAVEN_OPTS to include your preferred server

If you always build for one server, then you might wish to define
If you always build for one server, then you might wish to define
MAVEN_OPTS to include your preferred server flag, for example:

export MAVEN_OPTS=${MAVEN_OPTS} -Dtomcat=true
Expand Down
14 changes: 7 additions & 7 deletions planet-business/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<dependencies>

<dependency>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
<version>${roller.version}</version>
Expand Down Expand Up @@ -198,7 +198,7 @@
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
<argLine>-javaagent:${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar</argLine>

<systemProperties>
<property>
<name>catalina.base</name>
Expand Down Expand Up @@ -357,7 +357,7 @@
<!-- building for JBoss, turn on 'java:/' prefix on datasource JNDI name -->
<activation>
<property><name>jboss</name></property>
</activation>
</activation>
<properties>
<datasourceName>java:/RollerDS</datasourceName>
</properties>
Expand All @@ -368,20 +368,20 @@
<!-- not building for JBoss, don't use 'java:/' prefix on datasource JNDI name -->
<activation>
<property><name>!jboss</name></property>
</activation>
</activation>
<properties>
<datasourceName>jdbc/rollerdb</datasourceName>
</properties>
</profile>

<profile>
<id>openjpa</id>
<!-- building for Tomcat, so add OpenJPA bytecode enhancement -->
<activation>
<property>
<name>!javaee</name>
</property>
</activation>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
Expand Down Expand Up @@ -418,7 +418,7 @@
</build>
</profile>

</profiles>
</profiles>

</project>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
* A base exception class for Roller Planet.
*/
public class PlanetException extends RollerException {


public PlanetException() {
super();
}


/**
* Construct PlanetException with message string.
*
Expand All @@ -40,8 +40,8 @@ public PlanetException() {
public PlanetException(String s) {
super(s);
}


/**
* Construct PlanetException, wrapping existing throwable.
*
Expand All @@ -51,8 +51,8 @@ public PlanetException(String s) {
public PlanetException(String s, Throwable t) {
super(s, t);
}


/**
* Construct PlanetException, wrapping existing throwable.
*
Expand All @@ -61,5 +61,5 @@ public PlanetException(String s, Throwable t) {
public PlanetException(Throwable t) {
super(t);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
* implemenations can just override them if needed.
*/
public abstract class AbstractManagerImpl implements Manager {

public void initialize() throws InitializationException {
// no-op
}


public void release() {
// no-op
}


public void shutdown() {
// no-op
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
* Exception generated from Weblogger bootstrapping process.
*/
public class BootstrapException extends PlanetException {

public BootstrapException(String msg) {
super(msg);
}

public BootstrapException(String msg, Throwable t) {
super(msg, t);
}

}
Loading