Merge branch 'free'

processtech · Jun 12, 2019 · a518c7a · a518c7a
2 parents f65eec8 + bb601f9
commit a518c7a
Show file tree

Hide file tree

Showing 36 changed files with 66 additions and 823 deletions.
diff --git a/wfe-appserver/pom.xml b/wfe-appserver/pom.xml
@@ -63,12 +63,6 @@
 			<version>${project.version}</version>
 			<type>ear</type>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-remotebots</artifactId>
-			<version>${project.version}</version>
-			<type>ear</type>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -133,18 +127,6 @@
 							</descriptors>
 						</configuration>
 					</execution>
-					<execution>
-						<id>assemble-server-remotebots</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>src/assembly/7/wfe-bots-diff.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>

diff --git a/wfe-appserver/src/assembly/4/wfe-bots-diff.xml b/wfe-appserver/src/assembly/4/wfe-bots-diff.xml
diff --git a/wfe-appserver/src/assembly/7/wfe-bots-diff.xml b/wfe-appserver/src/assembly/7/wfe-bots-diff.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt b/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc b/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc
diff --git a/wfe-core/src/main/adminkit/conf/jndi.properties b/wfe-core/src/main/adminkit/conf/jndi.properties
diff --git a/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties b/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
diff --git a/wfe-core/src/main/adminkit/ldap-importer.bat b/wfe-core/src/main/adminkit/ldap-importer.bat
diff --git a/wfe-core/src/main/adminkit/ldap-importer.sh b/wfe-core/src/main/adminkit/ldap-importer.sh
diff --git a/wfe-core/src/main/adminkit/lib/content b/wfe-core/src/main/adminkit/lib/content
diff --git a/wfe-core/src/main/adminkit/log4j.xml b/wfe-core/src/main/adminkit/log4j.xml
diff --git a/wfe-core/src/main/adminkit/script-runner.bat b/wfe-core/src/main/adminkit/script-runner.bat
diff --git a/wfe-core/src/main/adminkit/script-runner.sh b/wfe-core/src/main/adminkit/script-runner.sh