Index: lams_common/conf/j2ee/application.xml =================================================================== diff -u -r67e6bb6752138f9ac416c2119021b9507d7032c6 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_common/conf/j2ee/application.xml (.../application.xml) (revision 67e6bb6752138f9ac416c2119021b9507d7032c6) +++ lams_common/conf/j2ee/application.xml (.../application.xml) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -7,16 +7,8 @@ - lasm_central.war + lams_central.war /lams - lams_admin.war - /lams/admin - lams_authoring.war - /lams/authoring - lams_learning.war - /lams/learning - lams_monitoring.war - /lams/monitoring \ No newline at end of file Index: lams_common/master-build.xml =================================================================== diff -u -r5d8371c9e00f362c61b223ff9741682f8266f14d -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_common/master-build.xml (.../master-build.xml) (revision 5d8371c9e00f362c61b223ff9741682f8266f14d) +++ lams_common/master-build.xml (.../master-build.xml) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -2,7 +2,7 @@ - + Index: lams_tool_deploy/build.xml =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/build.xml (.../build.xml) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/build.xml (.../build.xml) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -29,7 +29,7 @@ - + Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddWebAppToApplicationXmlTask.java =================================================================== diff -u -ra4ffc995ef80182d5703c580c641f69a4b9a8250 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddWebAppToApplicationXmlTask.java (.../AddWebAppToApplicationXmlTask.java) (revision a4ffc995ef80182d5703c580c641f69a4b9a8250) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddWebAppToApplicationXmlTask.java (.../AddWebAppToApplicationXmlTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -41,9 +41,14 @@ /** * Add the web uri and context root elements ot the Application xml */ - protected void updateApplicationXml(Document doc, Element webElement) throws DeployException + protected void updateApplicationXml(Document doc) throws DeployException { + + //create new module + Element moduleElement = doc.createElement("module"); + Element webElement = doc.createElement("web"); + moduleElement.appendChild(webElement); //create new web-uri element in the web element Element webUriElement = doc.createElement("web-uri"); webUriElement.appendChild(doc.createTextNode(webUri)); @@ -54,6 +59,8 @@ contextRootElement.appendChild(doc.createTextNode(contextRoot)); webElement.appendChild(contextRootElement); + doc.getDocumentElement().appendChild(moduleElement); + } } Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DBTask.java =================================================================== diff -u -r3e1c3cc5291e781560fe935140c6c985229df7e4 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DBTask.java (.../DBTask.java) (revision 3e1c3cc5291e781560fe935140c6c985229df7e4) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DBTask.java (.../DBTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * DBTask.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 29 March 2005, 17:02 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * Deploy.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 04 April 2005, 10:36 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java =================================================================== diff -u -r3e1c3cc5291e781560fe935140c6c985229df7e4 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 3e1c3cc5291e781560fe935140c6c985229df7e4) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * DeployConfig.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 04 April 2005 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTask.java =================================================================== diff -u -r3e1c3cc5291e781560fe935140c6c985229df7e4 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTask.java (.../DeployFilesTask.java) (revision 3e1c3cc5291e781560fe935140c6c985229df7e4) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTask.java (.../DeployFilesTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * DeployWarTask.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 29 March 2005, 16:57 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacer.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacer.java (.../FileTokenReplacer.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacer.java (.../FileTokenReplacer.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * FileTokenReplacer.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 30 March 2005, 13:06 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FilesTask.java =================================================================== diff -u --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FilesTask.java (revision 0) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FilesTask.java (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -0,0 +1,71 @@ +/* + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt + */ + +package org.lamsfoundation.lams.tool.deploy; +import java.util.List; +import java.io.File; +import java.io.IOException; +import org.apache.commons.io.FileUtils; + +/** + * Copies the required file to the lams ear directory. + * @author chris + */ +public abstract class FilesTask implements Task +{ + + /** + * Holds value of property lamsEarPath. + */ + protected String lamsEarPath; + + /** + * Holds value of property deployFiles. + */ + protected List deployFiles; + + /** Creates a new instance of DeployWarTask */ + public FilesTask() + { + } + + /** + * Setter for property lamsEarPath. + * @param lamsEarPath New value of property lamsEarPath. + */ + public void setLamsEarPath(String lamsEarPath) + { + + this.lamsEarPath = lamsEarPath; + } + + /** + * Setter for property deployFiles. + * @param deployFiles New value of property deployFiles. + */ + public void setDeployFiles(List deployFiles) + { + + this.deployFiles = deployFiles; + } + + +} Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveWebAppFromApplicationXmlTask.java =================================================================== diff -u -ra4ffc995ef80182d5703c580c641f69a4b9a8250 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveWebAppFromApplicationXmlTask.java (.../RemoveWebAppFromApplicationXmlTask.java) (revision a4ffc995ef80182d5703c580c641f69a4b9a8250) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveWebAppFromApplicationXmlTask.java (.../RemoveWebAppFromApplicationXmlTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -41,19 +41,17 @@ /** * Removes the web uri adn context root from the application xml */ - protected void updateApplicationXml(Document doc, Element webElement) throws DeployException + protected void updateApplicationXml(Document doc) throws DeployException { //find & remove web uri element - NodeList webUriNodeList = webElement.getElementsByTagName("web-uri"); + NodeList webUriNodeList = doc.getElementsByTagName("web-uri"); Element matchingWebUriElement = findElementWithMatchingText(webUri, webUriNodeList); - webElement.removeChild(matchingWebUriElement); + Element moduleElement = (Element) matchingWebUriElement.getParentNode().getParentNode(); + doc.getDocumentElement().removeChild(moduleElement); - //find & remove context root element - NodeList contextRootNodeList = webElement.getElementsByTagName("context-root"); - Element matchingContextRootElement = findElementWithMatchingText(contextRoot, contextRootNodeList); - webElement.removeChild(matchingContextRootElement); + } } Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ScriptRunner.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ScriptRunner.java (.../ScriptRunner.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ScriptRunner.java (.../ScriptRunner.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * ScriptRunner.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 06 April 2005, 12:55 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Task.java =================================================================== diff -u -ra174a94fcb9db22380a89926f460afbef0216c91 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Task.java (.../Task.java) (revision a174a94fcb9db22380a89926f460afbef0216c91) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Task.java (.../Task.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * Task.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 29 March 2005, 17:07 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTask.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTask.java (.../ToolDBActivateTask.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTask.java (.../ToolDBActivateTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * InsertToolDBRecordsTask.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 24 March 2005, 11:01 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java (.../ToolDBDeployTask.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java (.../ToolDBDeployTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * ToolDBActivateTask.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 24 March 2005, 15:04 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateApplicationXmlTask.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateApplicationXmlTask.java (.../UpdateApplicationXmlTask.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/UpdateApplicationXmlTask.java (.../UpdateApplicationXmlTask.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -108,10 +108,8 @@ { Document doc = parseApplicationXml(); - Element webElement = findWebElement(doc); + updateApplicationXml(doc); - updateApplicationXml(doc, webElement); - writeApplicationXml(doc); } @@ -245,11 +243,9 @@ /** * Modifies the application Xml in the required manner. * Abstract method to be implmented by subclasses. - * @param doc the DOM Document to modify - * @param webElement The web Element in the document to modify * @throws org.apache.tools.ant.DeployException in case of errors */ - protected abstract void updateApplicationXml(Document doc, Element webElement) throws DeployException; + protected abstract void updateApplicationXml(Document doc) throws DeployException; } Index: lams_tool_deploy/test/file/application.xml =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/file/application.xml (.../application.xml) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/file/application.xml (.../application.xml) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -30,14 +30,7 @@ lasm_central.war /lams - lams_admin.war - /lams/admin - lams_authoring.war - /lams/authoring - lams_learning.war - /lams/learning - lams_monitoring.war - /lams/monitoring + \ No newline at end of file Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DBConnector.java =================================================================== diff -u -r3e1c3cc5291e781560fe935140c6c985229df7e4 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DBConnector.java (.../DBConnector.java) (revision 3e1c3cc5291e781560fe935140c6c985229df7e4) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DBConnector.java (.../DBConnector.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * DBConnector.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 06 April 2005, 13:39 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java (.../DeployConfigTest.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployConfigTest.java (.../DeployConfigTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * DeployConfigTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 05 April 2005, 11:33 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTaskTest.java =================================================================== diff -u -r5a1e4424a7fee54a37abf1504b699077bd9f41fa -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTaskTest.java (.../DeployFilesTaskTest.java) (revision 5a1e4424a7fee54a37abf1504b699077bd9f41fa) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployFilesTaskTest.java (.../DeployFilesTaskTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * DeployFilesTaskTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 05 April 2005, 15:21 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployTest.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployTest.java (.../DeployTest.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployTest.java (.../DeployTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * DeployTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 08 April 2005, 10:55 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacerTest.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacerTest.java (.../FileTokenReplacerTest.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacerTest.java (.../FileTokenReplacerTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * FileTokenReplacerTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 30 March 2005, 14:50 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ScriptRunnerTest.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ScriptRunnerTest.java (.../ScriptRunnerTest.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ScriptRunnerTest.java (.../ScriptRunnerTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * ScriptRunnerTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 06 April 2005, 13:36 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTaskTest.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTaskTest.java (.../ToolDBActivateTaskTest.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTaskTest.java (.../ToolDBActivateTaskTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * ToolDBActivateTaskTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 07 April 2005, 16:06 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTaskTest.java =================================================================== diff -u -r8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTaskTest.java (.../ToolDBDeployTaskTest.java) (revision 8ad3ce44f05fdb00f6c9e7e2bbb6d65c70ca20c5) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTaskTest.java (.../ToolDBDeployTaskTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,8 +1,22 @@ /* - * ToolDBDeployTaskTest.java - * JUnit based test + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 07 April 2005, 11:21 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy; Index: lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBTest.java =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rb9682e51114d632fd77ff0feabf3f2de634744bd --- lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBTest.java (.../ToolDBTest.java) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/ToolDBTest.java (.../ToolDBTest.java) (revision b9682e51114d632fd77ff0feabf3f2de634744bd) @@ -1,7 +1,22 @@ /* - * ToolDBTest.java + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * Created on 07 April 2005, 16:03 + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt */ package org.lamsfoundation.lams.tool.deploy;