You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2025/05/10 10:59:02 UTC
(jspwiki) branch jakarta updated (0f2cd525e -> c0a1cf51b)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from 0f2cd525e Merge branch 'master' into jakarta
new 0b6ffcd7a pulled out xmlrpc
new 3f5117e90 typo
new edf41f85e moved xmlrpc to web-fragment
new fe62e609b add jboss-deployment-structure.xml
new c0a1cf51b Delete jspwiki-wikipages/de/.gitignore
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...database.xml => jboss-deployment-structure.xml} | 17 +++-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 62 +--------------
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 0
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 0
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 0
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 0
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 0
.../org/apache/wiki/xmlrpc/WikiRPCHandler.java | 0
.../src/main/resources/META-INF/web-fragment.xml | 90 ++++++++++++++++++++++
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 0
10 files changed, 106 insertions(+), 63 deletions(-)
copy jspwiki-war/src/main/webapp/WEB-INF/{groupdatabase.xml => jboss-deployment-structure.xml} (73%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java (100%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java (100%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java (100%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java (100%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java (100%)
rename {jspwiki-main => jspwiki-xmlrpc}/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java (100%)
create mode 100644 jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml
rename {jspwiki-main => jspwiki-xmlrpc}/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java (100%)
(jspwiki) 04/05: add jboss-deployment-structure.xml
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit fe62e609bf009e6a96e0bc432eb5d7231ca6176f
Author: Juergen Weber <we...@users.noreply.github.com>
AuthorDate: Wed Apr 16 21:04:37 2025 +0200
add jboss-deployment-structure.xml
---
.../webapp/WEB-INF/jboss-deployment-structure.xml | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/jspwiki-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/jspwiki-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 000000000..f6a483e20
--- /dev/null
+++ b/jspwiki-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!--
+ make JSPWiki's log4j coexist with Wildfly's
+-->
+<jboss-deployment-structure>
+ <deployment>
+
+ <dependencies>
+ <module name="org.jboss.logmanager" />
+ </dependencies>
+
+ <exclusions>
+ <module name="org.apache.logging.log4j.api" />
+ </exclusions>
+ </deployment>
+</jboss-deployment-structure>
+
(jspwiki) 02/05: typo
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 3f5117e90d0b582c2c5a6299367e12c4d3d145e6
Author: Juergen Weber <we...@dino.fritz.box>
AuthorDate: Mon Apr 7 21:13:58 2025 +0200
typo
---
.../src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java | 0
.../src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java | 0
7 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
diff --git a/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java b/jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
similarity index 100%
rename from jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
rename to jspwiki-xmlrpc/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
diff --git a/jspwiki-xmlrcp/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-xmlrpc/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
similarity index 100%
rename from jspwiki-xmlrcp/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
rename to jspwiki-xmlrpc/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
(jspwiki) 01/05: pulled out xmlrpc
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 0b6ffcd7a0178538d73aa9512778c67d41f86c2c
Author: Juergen Weber <we...@dino.fritz.box>
AuthorDate: Mon Apr 7 20:38:04 2025 +0200
pulled out xmlrpc
---
jspwiki-wikipages/de/.gitignore | 1 +
.../src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java | 0
.../src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java | 0
.../src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java | 0
8 files changed, 1 insertion(+)
diff --git a/jspwiki-wikipages/de/.gitignore b/jspwiki-wikipages/de/.gitignore
new file mode 100644
index 000000000..ae3c17260
--- /dev/null
+++ b/jspwiki-wikipages/de/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java b/jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
similarity index 100%
rename from jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
rename to jspwiki-xmlrcp/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java b/jspwiki-xmlrcp/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
similarity index 100%
rename from jspwiki-main/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
rename to jspwiki-xmlrcp/src/test/java/org/apache/wiki/xmlrpc/RPCHandlerTest.java
(jspwiki) 03/05: moved xmlrpc to web-fragment
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit edf41f85e12e34aa9e096b5a8bc53c0c67031cd7
Author: Juergen Weber <we...@dino.fritz.box>
AuthorDate: Tue Apr 15 21:55:24 2025 +0200
moved xmlrpc to web-fragment
---
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 62 +--------------
.../src/main/resources/META-INF/web-fragment.xml | 90 ++++++++++++++++++++++
2 files changed, 91 insertions(+), 61 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/WEB-INF/web.xml b/jspwiki-war/src/main/webapp/WEB-INF/web.xml
index c504ec15d..fb024da25 100644
--- a/jspwiki-war/src/main/webapp/WEB-INF/web.xml
+++ b/jspwiki-war/src/main/webapp/WEB-INF/web.xml
@@ -99,43 +99,6 @@
<listener-class>org.apache.wiki.bootstrap.WikiBootstrapServletContextListener</listener-class>
</listener>
- <!--
- Now, let's define the XML-RPC interfaces. You probably don't have to
- touch these.
-
- First, we'll define the standard XML-RPC interface.
- -->
- <servlet>
- <servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
- <init-param>
- <param-name>handler</param-name>
- <param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
- </init-param>
-
- <init-param>
- <param-name>prefix</param-name>
- <param-value>wiki</param-value>
- </init-param>
- </servlet>
-
- <!--
- OK, this then defines that our UTF-8 -capable server.
- -->
-
- <servlet>
- <servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
- <init-param>
- <param-name>handler</param-name>
- <param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
- </init-param>
-
- <init-param>
- <param-name>prefix</param-name>
- <param-value>wiki</param-value>
- </init-param>
- </servlet>
<!-- WikiAjaxDispatcherServlet -->
<servlet>
@@ -182,30 +145,7 @@
<url-pattern>/admin/ajax/*</url-pattern>
</servlet-mapping>
- <!--
- And finally, let us tell the servlet container which
- URLs should correspond to which XML RPC servlet.
- By default, this is disabled. If you want to enable it,
- just uncomment the whole section.
- -->
-
- <!-- REMOVE ME TO ENABLE XML-RPC
- <servlet-mapping>
- <servlet-name>XMLRPC</servlet-name>
- <url-pattern>/RPC2/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>XMLRPC-UTF8</servlet-name>
- <url-pattern>/RPCU/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ATOM</servlet-name>
- <url-pattern>/atom/*</url-pattern>
- </servlet-mapping>
- AND REMOVE ME TOO -->
-
+
<!-- This means that we don't have to use redirection
from index.html anymore. Yay! -->
<welcome-file-list>
diff --git a/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml b/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml
new file mode 100644
index 000000000..13fde7c8d
--- /dev/null
+++ b/jspwiki-xmlrpc/src/main/resources/META-INF/web-fragment.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+
+<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
+ version="3.0">
+
+
+ <!--
+ Now, let's define the XML-RPC interfaces. You probably don't have to
+ touch these.
+
+ First, we'll define the standard XML-RPC interface.
+ -->
+ <servlet>
+ <servlet-name>XMLRPC</servlet-name>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <init-param>
+ <param-name>handler</param-name>
+ <param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>prefix</param-name>
+ <param-value>wiki</param-value>
+ </init-param>
+ </servlet>
+
+ <!--
+ OK, this then defines that our UTF-8 -capable server.
+ -->
+
+ <servlet>
+ <servlet-name>XMLRPC-UTF8</servlet-name>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <init-param>
+ <param-name>handler</param-name>
+ <param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>prefix</param-name>
+ <param-value>wiki</param-value>
+ </init-param>
+ </servlet>
+
+ <!--
+ And finally, let us tell the servlet container which
+ URLs should correspond to which XML RPC servlet.
+ By default, this is disabled. If you want to enable it,
+ just uncomment the whole section.
+ -->
+
+ <!-- REMOVE ME TO ENABLE XML-RPC
+ <servlet-mapping>
+ <servlet-name>XMLRPC</servlet-name>
+ <url-pattern>/RPC2/</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XMLRPC-UTF8</servlet-name>
+ <url-pattern>/RPCU/</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ATOM</servlet-name>
+ <url-pattern>/atom/*</url-pattern>
+ </servlet-mapping>
+ AND REMOVE ME TOO -->
+
+
+</web-fragment>
\ No newline at end of file
(jspwiki) 05/05: Delete jspwiki-wikipages/de/.gitignore
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c0a1cf51b3e8f943366dbfab81bc86cf81223e01
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Sat May 10 12:58:17 2025 +0200
Delete jspwiki-wikipages/de/.gitignore
delete per comments
---
jspwiki-wikipages/de/.gitignore | 1 -
1 file changed, 1 deletion(-)
diff --git a/jspwiki-wikipages/de/.gitignore b/jspwiki-wikipages/de/.gitignore
deleted file mode 100644
index ae3c17260..000000000
--- a/jspwiki-wikipages/de/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/