Permalink
Browse files

merged the uttoxeter branch

  • Loading branch information...
leo
leo committed Sep 14, 2004
1 parent a080338 commit ac20e4092f8151391528a00b219b55cea1e110a8
Showing with 2,211 additions and 508 deletions.
  1. +24 −8 build.xml
  2. +1 −1 conf/build.properties
  3. +2 −8 conf/jetty.conf
  4. +1 −3 conf/manifest
  5. +2 −2 conf/snipsnap.conf
  6. BIN lib/graph-snipsnap.jar
  7. BIN lib/groovy-1.0-beta-6.jar
  8. BIN lib/groovy-1.0-rc1-snapshot.jar
  9. BIN lib/jdic.jar
  10. +1 −1 run.sh
  11. +2 −1 src/META-INF/services/org.snipsnap.graph.ContentRenderer
  12. +2 −0 src/META-INF/services/org.snipsnap.snip.label.TypeLabel
  13. +1 −2 src/apps/default/WEB-INF/classes/i18n/messages_de.properties
  14. +1 −2 src/apps/default/WEB-INF/classes/i18n/messages_en.properties
  15. +0 −2 src/apps/default/WEB-INF/classes/i18n/messages_it.properties
  16. +347 −0 src/apps/default/WEB-INF/classes/i18n/messages_ja.properties
  17. +353 −0 src/apps/default/WEB-INF/classes/i18n/messages_sv.properties
  18. +20 −24 src/apps/default/WEB-INF/classes/i18n/messages_zh_CN.properties
  19. +543 −0 src/apps/default/WEB-INF/classes/i18n/setup_sv.properties
  20. +84 −0 src/apps/default/WEB-INF/classes/i18n/snipsnap_sv.snip
  21. +12 −0 src/apps/default/WEB-INF/classes/i18n/welcome_sv.blog
  22. +2 −5 src/apps/default/WEB-INF/web-xml.tmpl
  23. +1 −1 src/apps/default/WEB-INF/web.xml
  24. +1 −0 src/apps/default/admin/configure.jsp
  25. +6 −0 src/apps/default/admin/css/config.css
  26. +1 −1 src/apps/default/login.jsp
  27. +1 −1 src/apps/default/register.jsp
  28. +18 −14 src/org/snipsnap/admin/AdminInitFilter.java
  29. +12 −12 src/org/snipsnap/date/Month.java
  30. +9 −5 src/org/snipsnap/graph/ExplorerContentRenderer.java
  31. +8 −3 src/org/snipsnap/graph/HorizontalContentRenderer.java
  32. +8 −3 src/org/snipsnap/graph/MindMapContentRenderer.java
  33. +11 −8 src/org/snipsnap/graph/NameSpaceTreeBuilder.java
  34. +7 −3 src/org/snipsnap/graph/PSPContentRenderer.java
  35. +56 −0 src/org/snipsnap/graph/UMLContentRenderer.java
  36. +8 −3 src/org/snipsnap/graph/VerticalContentRenderer.java
  37. +1 −1 src/org/snipsnap/net/CommentStoreServlet.java
  38. +33 −9 src/org/snipsnap/net/CssHandlerServlet.java
  39. +5 −5 src/org/snipsnap/net/GroovyTemplateServlet.java
  40. +21 −3 src/org/snipsnap/net/LoginServlet.java
  41. +13 −18 src/org/snipsnap/net/NameSpaceServlet.java
  42. +26 −19 src/org/snipsnap/net/NewUserServlet.java
  43. +8 −7 src/org/snipsnap/net/PluginServlet.java
  44. +31 −51 src/org/snipsnap/net/RenderServlet.java
  45. +5 −6 src/org/snipsnap/net/ServletPluginLoader.java
  46. +10 −10 src/org/snipsnap/net/SnipCopyServlet.java
  47. +12 −7 src/org/snipsnap/net/SnipStoreServlet.java
  48. +6 −6 src/org/snipsnap/net/admin/ConfigureServlet.java
  49. +27 −3 src/org/snipsnap/net/filter/GZIPFilter.java
  50. +12 −9 src/org/snipsnap/net/filter/GZIPResponseStream.java
  51. +10 −2 src/org/snipsnap/net/filter/GZIPResponseWrapper.java
  52. +21 −23 src/org/snipsnap/net/filter/InitFilter.java
  53. +11 −12 src/org/snipsnap/render/macro/GraphMacro.java
  54. +28 −44 src/org/snipsnap/server/AdminClient.java
  55. +9 −7 src/org/snipsnap/server/AdminXmlRpcHandler.java
  56. +186 −44 src/org/snipsnap/server/AppServer.java
  57. +13 −7 src/org/snipsnap/server/ApplicationLoader.java
  58. +67 −44 src/org/snipsnap/server/Launcher.java
  59. +18 −7 src/org/snipsnap/server/SnipSnapLauncher.java
  60. +8 −11 src/org/snipsnap/snip/SnipImpl.java
  61. +9 −6 src/org/snipsnap/snip/label/TypeLabel.java
  62. +1 −1 src/org/snipsnap/test/server/AllServerTests.java
  63. +62 −22 src/org/snipsnap/test/server/XmlRpcServerTest.java
  64. +10 −10 src/org/snipsnap/util/ConnectionManager.java
  65. +3 −1 src/org/snipsnap/util/URLEncoderDecoder.java
@@ -15,6 +15,7 @@
<pathelement location="${jar}/org.mortbay.jetty.jar"/>
<pathelement location="${jar}/mckoidb.jar"/>
<pathelement location="${jar}/xmlrpc-1.2-b1.jar"/>
<pathelement location="${jar}/jdic.jar"/>
</path>

<path id="snipsnap.test">
@@ -28,7 +29,7 @@
<pathelement location="${jar}/asm-1.4.1.jar"/>
<pathelement location="${jar}/dynaop-1.0-beta.jar"/>
<pathelement location="${jar}/cglib-asm-1.0.jar"/>
<pathelement location="${jar}/groovy-1.0-rc1-snapshot.jar"/>
<pathelement location="${jar}/groovy-1.0-beta-6.jar"/>
<pathelement location="${jar}/graph-snipsnap.jar"/>
<pathelement location="${jar}/radeox.jar"/>
<pathelement location="${jar}/jena.jar"/>
@@ -60,8 +61,8 @@
</path>

<path id="test.classpath">
<path refid="all.classpath"/>
<pathelement location="${jar}/junit.jar"/>
<path refid="all.classpath"/>
<pathelement location="${jar}/junit.jar"/>
</path>

<!-- build distribution -->
@@ -205,15 +206,12 @@
</target>

<!-- create server code -->
<target depends="compile-jsp, compile-server,installer-war" description="create server jar" name="jar-server">
<target depends="compile-jsp, compile-server,installer-war,snipsnap-war" description="create server jar" name="jar-server">
<copy file="conf/copyright.txt" tofile="${target}/server/conf/copyright.txt" filtering="true">
<filterset>
<filter token="VERSION" value="${snipsnap.server.version}"/>
</filterset>
</copy>
<jar destfile="${jar}/${appname}.jar" excludes="**/CVS" manifest="conf/launcher.manifest">
<fileset dir="${target}/server" includes="org/snipsnap/server/*Launcher*"/>
</jar>
<jar destfile="${jar}/${appname}-server.jar" excludes="**/CVS, org/snipsnap/server/*Launcher*" manifest="conf/manifest">
<fileset dir="${target}/server" includes="**">
<exclude name="org/snipsnap/server/*Launcher*"/>
@@ -226,6 +224,24 @@
<fileset dir="${src}" includes="org/snipsnap/config/defaults.conf"/>
<fileset dir="${src}" includes="org/snipsnap/config/transpose.map"/>
</jar>
<jar destfile="${jar}/${appname}.jar" excludes="**/CVS" manifest="conf/launcher.manifest">
<fileset dir="${target}/server" includes="org/snipsnap/server/*Launcher*"/>
<fileset dir="${jar}">
<include name="jdic.jar"/>
<include name="snipsnap-server.jar"/>
<include name="org.mortbay.jetty.jar"/>
<include name="javax.servlet.jar"/>
<include name="org.apache.crimson.jar"/>
<include name="org.apache.jasper.jar"/>
<include name="xmlrpc-1.2-b1.jar"/>
<include name="mckoidb.jar"/>
<include name="mysql-connector.jar"/>
<include name="postgres-jdbc.jar"/>
<include name="snipsnap-server.jar"/>
<include name="snipsnap-installer.war"/>
<include name="snipsnap.war"/>
</fileset>
</jar>
</target>

<target depends="generate" description="compile server code" name="compile-server">
@@ -423,7 +439,7 @@
<include name="dynaop-1.0-beta.jar"/>
<include name="cglib-asm-1.0.jar"/>
<include name="asm-util-1.4.1.jar"/>
<include name="groovy-1.0-rc1-snapshot.jar"/>
<include name="groovy-1.0-beta-6.jar"/>
<include name="graph-snipsnap.jar"/>
<include name="radeox.jar"/>
<include name="jena.jar"/>
@@ -11,7 +11,7 @@ deprecation=true
debug=true

# precompile jsp pages (comment out to not precompile jsp)
#precompile.jsp=true
precompile.jsp=true

# lib directory containing jar and war files
jar=${basedir}/lib
@@ -23,7 +23,7 @@
<Call name="addListener">
<Arg>
<New class="org.mortbay.http.SunJsseListener">
<Set name="Port">8669</Set>
<Set name="Port">8669</Set>
<Set name="MinThreads">5</Set>
<Set name="MaxThreads">30</Set>
<Set name="MaxIdleTimeMs">50000</Set>
@@ -34,13 +34,7 @@
</New>
</Arg>
</Call>
-->
<Call name="addWebApplication">
<Arg>/install</Arg>
<Arg>
<SystemProperty name="jetty.home" default="."/>/lib/snipsnap-installer.war
</Arg>
</Call>
-->

<Set name="RequestLog">
<New class="org.mortbay.http.NCSARequestLog">
@@ -1,6 +1,4 @@
Manifest-Version: 1.0
Created-By: SnipSnap Project (http://snipsnap.org)
Main-Class: org.snipsnap.server.AppServer
Class-Path: org.mortbay.jetty.jar javax.servlet.jar org.apache.jasper.jar \
org.apache.crimson.jar xmlrpc-1.2-b1.jar \
mckoidb.jar mysql-connector.jar postgres-jdbc.jar
Class-Path: org.mortbay.jetty.jar javax.servlet.jar org.apache.jasper.jar org.apache.crimson.jar xmlrpc-1.2-b1.jar mckoidb.jar mysql-connector.jar postgres-jdbc.jar jdic.jar
@@ -2,11 +2,11 @@
# $Id$
#
# current version and encoding
snipsnap.server.version=1.0-BETA-1-cvs
snipsnap.server.version=1.0b1-uttoxeter
snipsnap.server.encoding=UTF-8
#
# administration server port
snipsnap.server.admin.rpc.url=http://localhost:8574
#
# web application root directory
snipsnap.server.webapp.root=./applications
snipsnap.server.webapp.root=applications
BIN +74.8 KB (180%) lib/graph-snipsnap.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +120 KB lib/jdic.jar
Binary file not shown.
2 run.sh
@@ -27,5 +27,5 @@ JAVA_OPTS="$JAVA_OPTS -DentityExpansionLimit=1000000 -Djava.awt.headless=true -X
# uncomment if you have a lot of memory and want optimizations
JAVA_OPTS="$JAVA_OPTS -Xsqnopause -XX:+UseLWPSynchronization -Xms512m -Xmx1024m -Xss256k -XX:MaxNewSize=96m -XX:MaxPermSize=512m"

$JAVA $JAVA_OPTS $DBG -jar lib/snipsnap.jar $*
$JAVA $JAVA_OPTS $DBG -Dlauncher.errlog=server.log -jar lib/snipsnap.jar $*

@@ -1,7 +1,8 @@
# Content Renderer for the {graph} macro
#
org.snipsnap.graph.HorizontalContentRenderer
org.snipsnap.graph.VerticalContentRenderer
org.snipsnap.graph.MindMapContentRenderer
org.snipsnap.graph.HorizontalContentRenderer
org.snipsnap.graph.ExplorerContentRenderer
org.snipsnap.graph.PSPContentRenderer
org.snipsnap.graph.UMLContentRenderer
@@ -9,3 +9,5 @@ Process
Summary
Category
Template
text/gsp
text/groovy
@@ -80,8 +80,6 @@ login.register.title=Neuen Benutzer Registrieren
login.register=Registrieren
login.register.error.user.exists=Der Benutzerbane existiert bereits, bitte anderen Namen wählen!
login.register.error.user.short=Der Benutzername ist zu kurz (mind. 3 Buchstaben)!
login.register.error.user.illegal=Ungültiger Benutzername! Der Benutzername darf nur \
Buchstaben, Zahlen, Unterstrich oder Punkt enthalten.
login.register.error.passwords=Passwörter stimmen nicht überein!
login.register.error.password.short=Passwort muß mindestens 3 Buchstaben lang sein!
login.register.error.not.allowed=Es ist nicht zugelassen neue Benutzer zu registrieren!
@@ -206,6 +204,7 @@ macro.field.params=\

# Graph Macro
macro.graph.description=Erzeugt eine Grafik, wie ein Organigramm oder UML.
macro.graph.params=1: Graph-Typ (horizontal, vertical, mindmap, explorer, uml)

# Snip-By-Hotness Macro
macro.hotsnip.description=Generiert eine Liste von Snips, sortiert nach der \
@@ -80,8 +80,6 @@ login.register.title=Register New User
login.register=Register
login.register.error.user.exists=User exists, please choose another login name!
login.register.error.user.short=User name too short (min. 3 characters)!
login.register.error.user.illegal=Illegal user name! Should only contain \
letters, numbers, underscore and a dot.
login.register.error.passwords=Passwords do not match!
login.register.error.password.short=Password must be at least 3 characters long!
login.register.error.not.allowed=Not allowed to register new users!
@@ -206,6 +204,7 @@ macro.field.params=\

# Graph MAcro
macro.graph.description=Render a graph like an organigram or mindmap.
macro.graph.params=1: Graph-Type (horizontal, vertical, mindmap, explorer, uml)

# Snip-By-Hotness Macro
macro.hotsnip.description=Displays a list of snips sorted by their \"hotness\" (view count).
@@ -83,8 +83,6 @@ login.register.title=Registra un nuovo utente
login.register=Registrati
login.register.error.user.exists=Utente già esistente, scegliere un altro user name!
login.register.error.user.short=User name troppo corto (minimo 3 caratteri)!
login.register.error.user.illegal=User name non valido! Dovrebbe contenere \
solamente lettere, numeri, underscore e il carattere punto.
login.register.error.passwords=La password non corrisponde!
login.register.error.password.short=La password deve essere lunga almeno 3 caratteri!
login.register.error.not.allowed=Non è consentito registrare nuovi utenti!
Oops, something went wrong.

0 comments on commit ac20e40

Please sign in to comment.