Skip to content

Commit

Permalink
Improve dependencies for JavaMonitor and wotaskd.
Browse files Browse the repository at this point in the history
E.g. added XercesImpl (for XML processing in WO, a hidden dependency) and slf4j binding to reload4j to get some logging.
  • Loading branch information
lbane committed Sep 18, 2024
1 parent c5b35a6 commit f329092
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Applications/JavaMonitor/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ principalClass=com.webobjects.monitor.application.Application
project.type=application
webXML=false
webXML_CustomContent=
jvmOptions=--add-exports=java.base/sun.security.action=ALL-UNNAMED
jdbOptions=--add-exports=java.base/sun.security.action=ALL-UNNAMED
9 changes: 9 additions & 0 deletions Applications/JavaMonitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
<groupId>wonder.eof</groupId>
<artifactId>ERRest</artifactId>
</dependency>
<dependency>
<!-- indirect dependency from the WebObjects framework, that would be satified by the excludeded WOXML framework -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>Sources</sourceDirectory>
Expand Down
2 changes: 2 additions & 0 deletions Applications/wotaskd/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ principalClass=com.webobjects.monitor.wotaskd.Application
project.type=application
webXML=false
webXML_CustomContent=
jvmOptions=--add-exports=java.base/sun.security.action=ALL-UNNAMED
jdbOptions=--add-exports=java.base/sun.security.action=ALL-UNNAMED
11 changes: 9 additions & 2 deletions Applications/wotaskd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,19 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<!-- indirect dependency from the WebObjects framework, that would be satified by the excludeded WOXML framework -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</dependency>
</dependencies>
<build>
Expand Down
3 changes: 3 additions & 0 deletions Applications/wotaskd/wotaskd.launch
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10; &lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10; &lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10; &lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;JavaMonitorFramework&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10; &lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
Expand All @@ -24,6 +26,7 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.webobjects.monitor.wotaskd.Application"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="wotaskd"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="wotaskd"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-exports=java.base/sun.security.action=ALL-UNNAMED"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${working_dir_loc_WOLips:wotaskd}"/>
<stringAttribute key="org.objectstyle.wolips.launchinfo" value="-D2WWebAssistantEnabled=&lt;&gt;false&lt;&gt;false&lt;&gt;-DWORoot=&lt;&gt;Automatic&lt;&gt;true&lt;&gt;-DWORootDirectory=&lt;&gt;Automatic&lt;&gt;true&lt;&gt;-DWOUserDirectory=&lt;&gt;Automatic&lt;&gt;true&lt;&gt;-EOAdaptorDebugEnabled=&lt;&gt;false&lt;&gt;false&lt;&gt;-WOAcceptMalformedCookies&lt;&gt;false&lt;&gt;false&lt;&gt;-WOAdaptor&lt;&gt;WODefaultAdaptor&lt;&gt;false&lt;&gt;-WOAdaptorURL&lt;&gt;http://127.0.0.1/cgi-bin/WebObjects&lt;&gt;false&lt;&gt;-WOAdditionalAdaptors&lt;&gt;()&lt;&gt;false&lt;&gt;-WOAllowRapidTurnaround&lt;&gt;true&lt;&gt;false&lt;&gt;-WOAllowsCacheControlHeader&lt;&gt;true&lt;&gt;false&lt;&gt;-WOAllowsConcurrentRequestHandling&lt;&gt;false&lt;&gt;false&lt;&gt;-WOApplicationBaseURL&lt;&gt;/WebObjects&lt;&gt;false&lt;&gt;-WOApplicationClassName&lt;&gt;Automatic&lt;&gt;false&lt;&gt;-WOAutoOpenClientApplication&lt;&gt;true&lt;&gt;false&lt;&gt;-WOAutoOpenInBrowser&lt;&gt;false&lt;&gt;false&lt;&gt;-WOCachingEnabled&lt;&gt;false&lt;&gt;false&lt;&gt;-WOContextClassName&lt;&gt;WOContext&lt;&gt;false&lt;&gt;-WODebuggingEnabled&lt;&gt;true&lt;&gt;false&lt;&gt;-WODefaultUndoStackLimit&lt;&gt;10&lt;&gt;false&lt;&gt;-WODirectConnectEnabled&lt;&gt;true&lt;&gt;false&lt;&gt;-WODisplayExceptionPages&lt;&gt;true&lt;&gt;false&lt;&gt;-WOFrameworksBaseURL&lt;&gt;/WebObjects/Frameworks&lt;&gt;false&lt;&gt;-WOGenerateWSDL&lt;&gt;true&lt;&gt;false&lt;&gt;-WOIDE&lt;&gt;WOLips&lt;&gt;false&lt;&gt;-WOIncludeCommentsInResponse&lt;&gt;false&lt;&gt;false&lt;&gt;-WOLifebeatDestinationPort&lt;&gt;1085&lt;&gt;false&lt;&gt;-WOLifebeatEnabled&lt;&gt;true&lt;&gt;false&lt;&gt;-WOLifebeatInterval&lt;&gt;30&lt;&gt;false&lt;&gt;-WOListenQueueSize&lt;&gt;128&lt;&gt;false&lt;&gt;-WOMaxHeaders&lt;&gt;200&lt;&gt;false&lt;&gt;-WOMaxIOBufferSize&lt;&gt;8196&lt;&gt;false&lt;&gt;-WOMaxSocketIdleTime&lt;&gt;180000&lt;&gt;false&lt;&gt;-WOMissingResourceSearchEnabled&lt;&gt;true&lt;&gt;false&lt;&gt;-WOMonitorEnabled&lt;&gt;false&lt;&gt;false&lt;&gt;-WOSMTPHost&lt;&gt;smtp&lt;&gt;false&lt;&gt;-WOSessionStoreClassName&lt;&gt;WOServerSessionStore&lt;&gt;false&lt;&gt;-WOSessionTimeOut&lt;&gt;3600&lt;&gt;false&lt;&gt;-WOSocketCacheSize&lt;&gt;100&lt;&gt;false&lt;&gt;-WOSocketMonitorSleepTime&lt;&gt;50&lt;&gt;false&lt;&gt;-WOWorkerThreadCount&lt;&gt;8&lt;&gt;false&lt;&gt;-WOWorkerThreadCountMax&lt;&gt;256&lt;&gt;false&lt;&gt;-WOWorkerThreadCountMin&lt;&gt;16&lt;&gt;false&lt;&gt;-WSAssistantEnabled&lt;&gt;false&lt;&gt;false"/>
</launchConfiguration>
1 change: 0 additions & 1 deletion Examples/Misc/BackgroundTasks/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
eclipse.preferences.version=1
encoding//Sources/wowodc/background/components/AppMonitor.java=UTF-8
encoding//Sources/wowodc/background/components/TaskThreadMonitor.java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
encoding/Components=UTF-8
encoding/Sources=UTF-8
Expand Down
1 change: 0 additions & 1 deletion Frameworks/Mail/ERCMail/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
eclipse.preferences.version=1
encoding//src/main/resources=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
encoding/Components=UTF-8
encoding/Sources=UTF-8
encoding/Tests=UTF-8
1 change: 0 additions & 1 deletion Frameworks/Misc/ERGoogleSignIn/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
eclipse.preferences.version=1
encoding//src/main/resources=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
encoding/Components=UTF-8
encoding/Sources=UTF-8
encoding/Tests=UTF-8
5 changes: 5 additions & 0 deletions Frameworks/Misc/JavaMonitorFramework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<groupId>com.webobjects</groupId>
<artifactId>JavaWebObjects</artifactId>
</dependency>
<dependency>
<!-- indirect dependency from the WebObjects framework, that would be satified by the excludeded WOXML framework -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>Sources</sourceDirectory>
Expand Down
13 changes: 13 additions & 0 deletions Frameworks/PlugIns/OpenBaseWOPKPlugIn/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,18 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="Sources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="Tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
15 changes: 15 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,21 @@
<artifactId>sshd-pam</artifactId>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-impl</artifactId>
Expand Down

0 comments on commit f329092

Please sign in to comment.