diff --git a/docs/source/advancedDevelopment/deployment/executeJar.rst b/docs/source/advancedDevelopment/deployment/executeJar.rst index 00fed201..3bd638d5 100644 --- a/docs/source/advancedDevelopment/deployment/executeJar.rst +++ b/docs/source/advancedDevelopment/deployment/executeJar.rst @@ -26,13 +26,13 @@ The output should include: .. code-block:: none - [DEBUG] Executing command line: [C:\Program Files (x86)\Common Files\Oracle\Java\javapath\java.exe, -classpath, C:\Users\martijn\frank-manual\srcSteps\mavenWebapp\v510\target\classes;C:\Users\martijn\.m2\repository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar, org.wearefrank.maven.webapp.example.Main] + [DEBUG] Executing command line: [C:\Program Files (x86)\Common Files\Oracle\Java\javapath\java.exe, -classpath, C:\Users\martijn\frank-manual\srcSteps\mavenWebapp\v510\target\classes;C:\Users\martijn\.m2\repository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar, org.frankframework.maven.webapp.example.Main] The output is a comma-separated list of the arguments used to start ``java.exe``. You see here that ``java.exe`` was executed like this: .. code-block:: none - C:\Program Files (x86)\Common Files\Oracle\Java\javapath\java.exe -classpath C:\Users\martijn\frank-manual\srcSteps\mavenWebapp\v510\target\classes;C:\Users\martijn\.m2\repository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar org.wearefrank.maven.webapp.example.Main + C:\Program Files (x86)\Common Files\Oracle\Java\javapath\java.exe -classpath C:\Users\martijn\frank-manual\srcSteps\mavenWebapp\v510\target\classes;C:\Users\martijn\.m2\repository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar org.frankframework.maven.webapp.example.Main 5. Please run this command directly on a command prompt. You may have to quote some words and you may have to adjust some directory names depending on your operating system and your work directory. diff --git a/docs/source/advancedDevelopment/deployment/mavenBasics.rst b/docs/source/advancedDevelopment/deployment/mavenBasics.rst index ccafba00..23ca2460 100644 --- a/docs/source/advancedDevelopment/deployment/mavenBasics.rst +++ b/docs/source/advancedDevelopment/deployment/mavenBasics.rst @@ -10,9 +10,9 @@ Maven can best be introduced using a simple Hello World application. Please do t 1. Choose some work directory, say ``work``. #. Within ``work``, create folder ``src/main/java``. This is where Maven expects Java sources. -#. Within ``work/src/main/java``, open ``org/wearefrank/maven/webapp/example/Main.java``. Populate it with the following text: +#. Within ``work/src/main/java``, open ``org/frankframework/maven/webapp/example/Main.java``. Populate it with the following text: - .. literalinclude:: ../../../../srcSteps/mavenWebapp/v500/src/main/java/org/wearefrank/maven/webapp/example/Main.java + .. literalinclude:: ../../../../srcSteps/mavenWebapp/v500/src/main/java/org/frankframework/maven/webapp/example/Main.java This is a program that should be started from the command line. It simply prints "HELLO WORLD!". To demonstrate Maven, a dependency has been introduced. This program needs Java class ``org.apache.commons.lang3.StringUtils``. @@ -112,14 +112,14 @@ The output should look like this: │ └───main │ └───java │ └───org - │ └───wearefrank + │ └───frankframework │ └───maven │ └───webapp │ └───example └───target ├───classes │ └───org - │ └───wearefrank + │ └───frankframework │ └───maven │ └───webapp │ └───example @@ -132,7 +132,7 @@ The output should look like this: C:\Users\martijn\frank-manual\srcSteps\mavenWebapp\v500> -All generated files appear in the ``target`` directory. Within that directory, there is a directory ``classes``. This directory holds everything that this artifact will put on the classpath when the linked application executes. There is a path ``org/wearefrank/maven/webapp/example``. This path resembles the path to file ``Main.java``. The directory holds file ``Main.class``, the byte code produced by compiling source file ``Main.java`` (not shown). +All generated files appear in the ``target`` directory. Within that directory, there is a directory ``classes``. This directory holds everything that this artifact will put on the classpath when the linked application executes. There is a path ``org/frankframework/maven/webapp/example``. This path resembles the path to file ``Main.java``. The directory holds file ``Main.class``, the byte code produced by compiling source file ``Main.java`` (not shown). 11. Assemble the artifact of this project, which has ```` ``org.ibissource``, ```` ``mavenWebappExample`` and ```` ``1.0-SNAPSHOT``. Do so by entering ``mvn install``. #. Check that you have file ``mavenWebappExample-1.0-SNAPSHOT.jar``. This is a ZIP file that holds all data that this artifact should put on the classpath. diff --git a/docs/source/advancedDevelopment/deployment/mavenWebapp.rst b/docs/source/advancedDevelopment/deployment/mavenWebapp.rst index 0bba180e..90e6429f 100644 --- a/docs/source/advancedDevelopment/deployment/mavenWebapp.rst +++ b/docs/source/advancedDevelopment/deployment/mavenWebapp.rst @@ -8,9 +8,9 @@ Maven webapplications are usually not executed by starting the JVM directly. Ins Webapplications do network communication using the Hypertext Transfer Protocol (HTTP). First, update the ``Main`` class of subsection :ref:`advancedDevelopmentDeploymentMavenMavenBasics` to talk HTTP: #. Undo the changes of subsection :ref:`advancedDevelopmentDeploymentMavenExecuteJar` by restoring the copy you made at the beginning of that subsection. -#. Change file ``work/src/main/java/org/wearefrank/maven/webapp/example/Main.java`` to become as follows: +#. Change file ``work/src/main/java/org/frankframework/maven/webapp/example/Main.java`` to become as follows: - .. literalinclude:: ../../../../srcSteps/mavenWebapp/v520/src/main/java/org/wearefrank/maven/webapp/example/Main.java + .. literalinclude:: ../../../../srcSteps/mavenWebapp/v520/src/main/java/org/frankframework/maven/webapp/example/Main.java #. Link this servlet to the URL that should trigger it. Do so by creating file ``work/src/main/webapp/WEB-INF/web.xml`` and give it the following contents: diff --git a/docs/source/gettingStarted/exercise.rst b/docs/source/gettingStarted/exercise.rst index f746b79c..a97a126f 100644 --- a/docs/source/gettingStarted/exercise.rst +++ b/docs/source/gettingStarted/exercise.rst @@ -24,11 +24,11 @@ Here is an example of an input XML message to be processed: .. literalinclude:: ../../../srcSteps/exercise/v500/tests/Conclusion/valid.xml :language: xml -All elements of this request have namespace ``http://wearefrank.nl/manual/exercise/conclusion``. +All elements of this request have namespace ``http://frankframework.org/manual/exercise/conclusion``. This message should be transformed according to the following: -* Mundo needs an XML in which every element has namespace ``http://wearefrank.nl/manual/exercise/mundo``. +* Mundo needs an XML in which every element has namespace ``http://frankframework.org/manual/exercise/mundo``. * The ```` and ```` elements are wrapped inside a ``
``. * The ````, ````, ````, ````, ````, ```` and ```` inside ```` and ```` elements remain the same apart from the namespace. * The ```` and ```` elements of a Conclusion request are not copied. Their values are combined and the resulting string is wrapped in an element ````. diff --git a/docs/source/gettingStarted/validMundo.xml b/docs/source/gettingStarted/validMundo.xml index 1d4854d8..a87c5d07 100644 --- a/docs/source/gettingStarted/validMundo.xml +++ b/docs/source/gettingStarted/validMundo.xml @@ -1,27 +1,27 @@
12345 Frank - info@wearefrank.nl - Westersingel - 42 - Rotterdam - 3014GT - The Netherlands + info@frankframework.org + Example Street + 1 + Example City + 1234AB + Example country 12346 Frits - frits@wearefrank.nl - Blaak - 1 - Rotterdam - 3016ZZ - The Netherlands + frits@frankframework.org + Other Example Street + 2 + Other Example City + 5678CD + Example country
diff --git a/docs/source/snippets/mavenWebapp/v510/addPlugin.md b/docs/source/snippets/mavenWebapp/v510/addPlugin.md index 681d30c0..294c9fba 100644 --- a/docs/source/snippets/mavenWebapp/v510/addPlugin.md +++ b/docs/source/snippets/mavenWebapp/v510/addPlugin.md @@ -16,7 +16,7 @@ -classpath - org.wearefrank.maven.webapp.example.Main + org.frankframework.maven.webapp.example.Main diff --git a/docs/source/snippets/mavenWebapp/v510/addPlugin.txt b/docs/source/snippets/mavenWebapp/v510/addPlugin.txt index 78f1863d..ae074637 100644 --- a/docs/source/snippets/mavenWebapp/v510/addPlugin.txt +++ b/docs/source/snippets/mavenWebapp/v510/addPlugin.txt @@ -18,7 +18,7 @@ -classpath - org.wearefrank.maven.webapp.example.Main + org.frankframework.maven.webapp.example.Main diff --git a/docs/source/snippets/mavenWebapp/v520/java.md b/docs/source/snippets/mavenWebapp/v520/java.md index 2f147141..92e41b5d 100644 --- a/docs/source/snippets/mavenWebapp/v520/java.md +++ b/docs/source/snippets/mavenWebapp/v520/java.md @@ -1,5 +1,5 @@ ```none -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; import javax.servlet.ServletException; diff --git a/docs/source/snippets/mavenWebapp/v520/java.txt b/docs/source/snippets/mavenWebapp/v520/java.txt index b2d5b14c..546cb6c1 100644 --- a/docs/source/snippets/mavenWebapp/v520/java.txt +++ b/docs/source/snippets/mavenWebapp/v520/java.txt @@ -1,6 +1,6 @@ .. code-block:: none - package org.wearefrank.maven.webapp.example; + package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; import javax.servlet.ServletException; diff --git a/srcSteps/exercise/v500/configurations/Conclusion/conclusion2mundo.xslt b/srcSteps/exercise/v500/configurations/Conclusion/conclusion2mundo.xslt index 679c892b..72ab93ea 100644 --- a/srcSteps/exercise/v500/configurations/Conclusion/conclusion2mundo.xslt +++ b/srcSteps/exercise/v500/configurations/Conclusion/conclusion2mundo.xslt @@ -1,7 +1,7 @@ @@ -14,7 +14,7 @@ - + diff --git a/srcSteps/exercise/v500/configurations/Conclusion/xmlInput.xsd b/srcSteps/exercise/v500/configurations/Conclusion/xmlInput.xsd index b0a1998f..b28e4433 100644 --- a/srcSteps/exercise/v500/configurations/Conclusion/xmlInput.xsd +++ b/srcSteps/exercise/v500/configurations/Conclusion/xmlInput.xsd @@ -1,7 +1,7 @@ diff --git a/srcSteps/exercise/v500/tests/Conclusion/expectedMessageToMundo.xml b/srcSteps/exercise/v500/tests/Conclusion/expectedMessageToMundo.xml index a2459b57..7b24fc72 100644 --- a/srcSteps/exercise/v500/tests/Conclusion/expectedMessageToMundo.xml +++ b/srcSteps/exercise/v500/tests/Conclusion/expectedMessageToMundo.xml @@ -1,25 +1,25 @@ - - + + 12345 - Frank Frank - - info@wearefrank.nl - Westersingel - 42 - Rotterdam - 3014GT - The Netherlands + Frank + + info@frankframework.org + Example Street + 1 + Example City + 1234AB + Example country - + 12346 - Frits Frits + Frits - frits@wearefrank.nl - Blaak - 1 - Rotterdam - 3016ZZ - The Netherlands + frits@frankframework.org + Other Example Street + 2 + Other Example City + 5678CD + Example country VGhlIGRvY3VtZW50 \ No newline at end of file diff --git a/srcSteps/exercise/v500/tests/Conclusion/valid.xml b/srcSteps/exercise/v500/tests/Conclusion/valid.xml index cacdb256..50c20e22 100644 --- a/srcSteps/exercise/v500/tests/Conclusion/valid.xml +++ b/srcSteps/exercise/v500/tests/Conclusion/valid.xml @@ -1,27 +1,27 @@ 12345 Frank Frank - info@wearefrank.nl - Westersingel - 42 - Rotterdam - 3014GT - The Netherlands + info@frankframework.org + Example Street + 1 + Example City + 1234AB + Example country 12346 Frits - Frits - frits@wearefrank.nl - Blaak - 1 - Rotterdam - 3016ZZ - The Netherlands + Frank + frits@frankframework.org + Other Example Street + 2 + Other Example City + 5678CD + Example country \ No newline at end of file diff --git a/srcSteps/mavenWebapp/v480/meta.yml b/srcSteps/mavenWebapp/v480/meta.yml index d6a865d8..31d64b7e 100644 --- a/srcSteps/mavenWebapp/v480/meta.yml +++ b/srcSteps/mavenWebapp/v480/meta.yml @@ -2,5 +2,5 @@ path: pom.xml change: add - file: - path: src/main/java/org/wearefrank/maven/webapp/example/Main.java + path: src/main/java/org/frankframework/maven/webapp/example/Main.java change: add \ No newline at end of file diff --git a/srcSteps/mavenWebapp/v480/src/main/java/org/wearefrank/maven/webapp/example/Main.java b/srcSteps/mavenWebapp/v480/src/main/java/org/wearefrank/maven/webapp/example/Main.java index 805bf952..afe6f5a0 100644 --- a/srcSteps/mavenWebapp/v480/src/main/java/org/wearefrank/maven/webapp/example/Main.java +++ b/srcSteps/mavenWebapp/v480/src/main/java/org/wearefrank/maven/webapp/example/Main.java @@ -1,4 +1,4 @@ -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; diff --git a/srcSteps/mavenWebapp/v490/src/main/java/org/wearefrank/maven/webapp/example/Main.java b/srcSteps/mavenWebapp/v490/src/main/java/org/wearefrank/maven/webapp/example/Main.java index 805bf952..afe6f5a0 100644 --- a/srcSteps/mavenWebapp/v490/src/main/java/org/wearefrank/maven/webapp/example/Main.java +++ b/srcSteps/mavenWebapp/v490/src/main/java/org/wearefrank/maven/webapp/example/Main.java @@ -1,4 +1,4 @@ -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; diff --git a/srcSteps/mavenWebapp/v500/src/main/java/org/wearefrank/maven/webapp/example/Main.java b/srcSteps/mavenWebapp/v500/src/main/java/org/wearefrank/maven/webapp/example/Main.java index 805bf952..afe6f5a0 100644 --- a/srcSteps/mavenWebapp/v500/src/main/java/org/wearefrank/maven/webapp/example/Main.java +++ b/srcSteps/mavenWebapp/v500/src/main/java/org/wearefrank/maven/webapp/example/Main.java @@ -1,4 +1,4 @@ -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; diff --git a/srcSteps/mavenWebapp/v510/pom.xml b/srcSteps/mavenWebapp/v510/pom.xml index 1ea1e27e..7c6250ae 100644 --- a/srcSteps/mavenWebapp/v510/pom.xml +++ b/srcSteps/mavenWebapp/v510/pom.xml @@ -27,7 +27,7 @@ -classpath - org.wearefrank.maven.webapp.example.Main + org.frankframework.maven.webapp.example.Main diff --git a/srcSteps/mavenWebapp/v510/src/main/java/org/wearefrank/maven/webapp/example/Main.java b/srcSteps/mavenWebapp/v510/src/main/java/org/wearefrank/maven/webapp/example/Main.java index 805bf952..afe6f5a0 100644 --- a/srcSteps/mavenWebapp/v510/src/main/java/org/wearefrank/maven/webapp/example/Main.java +++ b/srcSteps/mavenWebapp/v510/src/main/java/org/wearefrank/maven/webapp/example/Main.java @@ -1,4 +1,4 @@ -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; diff --git a/srcSteps/mavenWebapp/v520/meta.yml b/srcSteps/mavenWebapp/v520/meta.yml index 5ac2a471..e665bda0 100644 --- a/srcSteps/mavenWebapp/v520/meta.yml +++ b/srcSteps/mavenWebapp/v520/meta.yml @@ -18,7 +18,7 @@ snippet: pomDepBuild highlight: true - file: - path: src/main/java/org/wearefrank/maven/webapp/example/Main.java + path: src/main/java/org/frankframework/maven/webapp/example/Main.java change: - old: 7 new: 12 diff --git a/srcSteps/mavenWebapp/v520/src/main/java/org/wearefrank/maven/webapp/example/Main.java b/srcSteps/mavenWebapp/v520/src/main/java/org/wearefrank/maven/webapp/example/Main.java index eed05092..424024b0 100644 --- a/srcSteps/mavenWebapp/v520/src/main/java/org/wearefrank/maven/webapp/example/Main.java +++ b/srcSteps/mavenWebapp/v520/src/main/java/org/wearefrank/maven/webapp/example/Main.java @@ -1,4 +1,4 @@ -package org.wearefrank.maven.webapp.example; +package org.frankframework.maven.webapp.example; import org.apache.commons.lang3.StringUtils; import javax.servlet.ServletException; diff --git a/srcSteps/mavenWebapp/v520/src/main/webapp/WEB-INF/web.xml b/srcSteps/mavenWebapp/v520/src/main/webapp/WEB-INF/web.xml index 455940f7..4a64f265 100644 --- a/srcSteps/mavenWebapp/v520/src/main/webapp/WEB-INF/web.xml +++ b/srcSteps/mavenWebapp/v520/src/main/webapp/WEB-INF/web.xml @@ -5,7 +5,7 @@ version="3.1"> hello - org.wearefrank.maven.webapp.example.Main + org.frankframework.maven.webapp.example.Main hello