Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1871 - in infrastructure/scarab: . scarab-dpml-extensions scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/classes scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: pneubauer AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1871 - in infrastructure/scarab: . scarab-dpml-extensions scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/classes scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions
  • Date: Mon, 21 Feb 2005 22:08:00 +0100

Author: pneubauer
Date: Mon Feb 21 22:07:58 2005
New Revision: 1871

Added:

infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf/custom.properties
infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt
Removed:
infrastructure/scarab/ant.properties

infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/classes/ScarabBundle_en.properties

infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf/CustomSettings.properties
Modified:
infrastructure/scarab/build.xml

infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/ChangePassword.vm

infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/Register.vm

infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/CommitHook.java

infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/ScmHandler.java
Log:
more fixes for the new build procedure


Modified: infrastructure/scarab/build.xml
==============================================================================
--- infrastructure/scarab/build.xml (original)
+++ infrastructure/scarab/build.xml Mon Feb 21 22:07:58 2005
@@ -7,13 +7,10 @@

<target name="prepare" >
<property file="build.properties" />
- <property file="ant.properties" />
- <property name="magic.repository" value="${user.home}/.magic/main" />
<available property="scarab.present" file="scarab/build/build.xml" />
-
</target>

- <target name="build-scarab" depends="prepare, checkout-scarab" >
+ <target name="build-scarab" depends="prepare, checkout-scarab,
patch-scarab" >
<echo file="scarab/build.properties">
scarab.database.name=scarab
scarab.database.username=issues
@@ -24,8 +21,14 @@
scarab.database.jdbc.driver = org.gjt.mm.mysql.Driver
scarab.database.url = jdbc:mysql://localhost/scarab
scarab.database.admin.url = jdbc:mysql://localhost/scarab
- </echo>
- <ant dir="scarab/build" target="compile" />
+ </echo>
+ <echo file="scarab/src/conf/classes/ScarabBundle_en.properties"
append="true">
+CommitterExplain=If you click on the "Register me as Committer", you
indicate that you have read, understood \
+and agreed to the &lt; href="UserAgreement.vm"&gt;Digital Product Meta
Library User Agreement&lt;/a&gt;.
+RegisterUser=Register me as User
+RegisterCommitter=Register me as Committer
+ </echo>
+ <ant dir="scarab/build" inheritrefs="false" inheritall="false"/>
<mkdir dir="${dpml.cache}/scarab/jars/" />
<jar destfile="${dpml.cache}/scarab/jars/scarab-SNAPSHOT.jar"
basedir="scarab/target/scarab/WEB-INF/classes/"
@@ -65,7 +68,10 @@
<arg value="scarab"/>
</exec>
</target>
-
+
+ <target name="patch-scarab">
+ <patch strip="0"
patchfile="scarab-dpml-extensions/scarab-build-patch.txt" dir="scarab"
quiet="false"/>
+ </target>
<target name="all" depends="deploy-extensions-into-scarab" />

<target name="clean" >

Added:
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf/custom.properties
==============================================================================
--- (empty file)
+++
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf/custom.properties
Mon Feb 21 22:07:58 2005
@@ -0,0 +1,6 @@
+system.mail.host=localhost
+system.mail.smtp.from=metro AT paris.dpml.net
+scarab.email.register.fromName=Metro Issue Notifier
+scarab.email.register.fromAddress=support-dpml AT lists.ibiblio.org
+module.packages=org.tigris.scarab,net.dpml.tools.scarab.extensions
+scarab.database.type=mysql
\ No newline at end of file

Modified:
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/ChangePassword.vm
==============================================================================
---
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/ChangePassword.vm
(original)
+++
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/ChangePassword.vm
Mon Feb 21 22:07:58 2005
@@ -1,5 +1,16 @@
<div id="changepassword" class="app">

+#if (! $data.User.hasLoggedIn())
+
+<p>
+$l10n.ToAccessFunctions1
+<a href="$link.setPage("Login.vm")">$l10n.Login</a>. $l10n.ToAccessFunctions2
+</p>
+
+<p>$l10n.format('IfYouAreNotRegistered', $link.setPage('Register.vm'))</p>
+
+#else
+
#set ($regGroup = $intake.Register.Default)
#if ($regGroup.UserName.Value && $regGroup.UserName.Value.length() > 0)
#set ($userNameValue = $regGroup.UserName.Value)
@@ -14,8 +25,8 @@
<h3>$l10n.ChangePassword</h3>

<form action="$link.setPage("ChangePassword.vm")" method="post">
- <input type="hidden" name="action" value="ChangeScarabAndSvnPassword" />
- <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE"
value="$data.User.HomePage" />
+ <input type="hidden" name="action" value="ChangeScarabAndSvnPassword" />
+ <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE"
value="$data.User.HomePage" />
<input type="hidden" name="username" value="$!userNameValue" />

<div class="axial">
@@ -57,3 +68,5 @@
$intake.declareGroups()
</form>
</div>
+
+#end

Modified:
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/Register.vm
==============================================================================
---
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/Register.vm
(original)
+++
infrastructure/scarab/scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens/Register.vm
Mon Feb 21 22:07:58 2005
@@ -1,95 +1,84 @@
-<div id="register" class="app">
-
-<h3>$l10n.Registration</h3>
-
-<form name="register" action="$link.setPage("Register.vm")" method="post">
-<input type="hidden" name="action" value="MetroRegister" />
-<input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE"
value="RegisterConfirm.vm" />
-<input type="hidden" name="$scarabG.Constant.CANCEL_TEMPLATE"
value="Login.vm" />
-
-## we set $password because we don't want the mapped users password to
-## show up in the form! Doh!
-#set ($user = $data.User.getTemp($scarabG.Constant.SESSION_REGISTER))
-#if ($user.FirstName)
- #set ($regGroup = $intake.Register.mapTo($user))
- #set ($password = "")
-#else
- #set ($regGroup = $intake.Register.Default)
- #set ($password = $regGroup.Password)
-#end
-
-<div class="axial">
-<table cellpadding="3" cellspacing="2" border="0">
-<tr>
- <th width="130"> * $l10n.FirstName</th>
- <td>
- <input name="$regGroup.FirstName.Key" value="$regGroup.FirstName"
type="text" size="25" tabindex="1" />
- #fieldErrorMsg($regGroup.FirstName "")
- </td>
-</tr>
-<tr>
- <th> * $l10n.LastName</th>
- <td>
- <input name="$regGroup.LastName.Key" value="$regGroup.LastName"
type="text" size="25" tabindex="2" />
- #fieldErrorMsg($regGroup.LastName "")
- </td>
-</tr>
-<tr>
- <th> * $l10n.Email</th>
- <td>
- <input name="$regGroup.Email.Key" value="$regGroup.Email" type="text"
size="25" tabindex="3" />
- #fieldErrorMsg($regGroup.Email "")
-<p><small>
- $l10n.EnterValidEmailAddress
-</small></p>
- </td>
-</tr>
-<tr>
- <th> * $l10n.Username</th>
- <td>
- <input name="$regGroup.UserName.Key" value="$regGroup.UserName"
type="text" size="25" tabindex="4" />
- #fieldErrorMsg($regGroup.UserName "")
-<p><small>$l10n.UserNameCanBe</small></p>
- </td>
-</tr>
-<tr>
- <th> * $l10n.Password</th>
- <td>
- <input name="$regGroup.Password.Key" type="password" value="$password"
size="25" tabindex="5" />
- #if ($password.Message)
- #fieldErrorMsg($password "")
- #end
- </td>
-</tr>
-<tr>
- <th> * $l10n.ConfirmPassword</th>
- <td>
- <input name="$regGroup.PasswordConfirm.Key" type="password"
value="$regGroup.PasswordConfirm" size="25" tabindex="6" />
- #fieldErrorMsg($regGroup.PasswordConfirm "")
- </td>
-</tr>
-</table>
-</div>
-
-#asterisk()
-
-<div class="UserAgreementNote" >
-$l10n.CommitterExplain
-</div>
-
-<div class="functnbar2">
- <input type="submit" name="eventSubmit_doRegister1"
value="$l10n.RegisterCommitter" tabindex="7" />&#160;
- <input type="submit" name="eventSubmit_doRegister"
value="$l10n.RegisterUser" tabindex="8" />&#160;
- <input type="submit" name="eventSubmit_doCancel" value="$l10n.Cancel"
tabindex="9" />
-</div>
-
-$intake.declareGroups()
-
-<script>
-<!--
-document.register.${regGroup.FirstName.Key}.focus();
-// -->
-</script>
-
-</form>
-</div>
+<div id="register" class="app">
+
+<h3>$l10n.Registration</h3>
+
+<form name="register" action="$link.setPage("Register.vm")" method="post">
+<input type="hidden" name="action" value="MetroRegister" />
+<input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE"
value="RegisterConfirm.vm" />
+<input type="hidden" name="$scarabG.Constant.CANCEL_TEMPLATE"
value="Login.vm" />
+
+#set ($regGroup = $intake.Register.Default)
+
+<div class="axial">
+<table cellpadding="3" cellspacing="2" border="0">
+<tr>
+ <th width="130"> * $l10n.FirstName</th>
+ <td>
+ <input name="$regGroup.FirstName.Key" value="$regGroup.FirstName"
type="text" size="25" tabindex="1" />
+ #fieldErrorMsg($regGroup.FirstName "")
+ </td>
+</tr>
+<tr>
+ <th> * $l10n.LastName</th>
+ <td>
+ <input name="$regGroup.LastName.Key" value="$regGroup.LastName"
type="text" size="25" tabindex="2" />
+ #fieldErrorMsg($regGroup.LastName "")
+ </td>
+</tr>
+<tr>
+ <th> * $l10n.Email</th>
+ <td>
+ <input name="$regGroup.Email.Key" value="$regGroup.Email" type="text"
size="25" tabindex="3" />
+ #fieldErrorMsg($regGroup.Email "")
+<p><small>
+ $l10n.EnterValidEmailAddress
+</small></p>
+ </td>
+</tr>
+<tr>
+ <th> * $l10n.Username</th>
+ <td>
+ <input name="$regGroup.UserName.Key" value="$regGroup.UserName"
type="text" size="25" tabindex="4" />
+ #fieldErrorMsg($regGroup.UserName "")
+<p><small>$l10n.UserNameCanBe</small></p>
+ </td>
+</tr>
+<tr>
+ <th> * $l10n.Password</th>
+ <td>
+ <input name="$regGroup.Password.Key" type="password"
value="$regGroup.Password" size="25" tabindex="5" />
+ #fieldErrorMsg($regGroup.Password "")
+ </td>
+</tr>
+<tr>
+ <th> * $l10n.ConfirmPassword</th>
+ <td>
+ <input name="$regGroup.PasswordConfirm.Key" type="password"
value="$regGroup.PasswordConfirm" size="25" tabindex="6" />
+ #fieldErrorMsg($regGroup.PasswordConfirm "")
+ </td>
+</tr>
+</table>
+</div>
+
+#asterisk()
+
+<div class="UserAgreementNote" >
+$l10n.CommitterExplain
+</div>
+
+<div class="functnbar2">
+ <input type="submit" name="eventSubmit_doRegister1"
value="$l10n.RegisterCommitter" tabindex="7" />&#160;
+ <input type="submit" name="eventSubmit_doRegister"
value="$l10n.RegisterUser" tabindex="8" />&#160;
+ <input type="submit" name="eventSubmit_doCancel" value="$l10n.Cancel"
tabindex="9" />
+</div>
+
+$intake.declareGroups()
+
+<script>
+<!--
+document.register.${regGroup.FirstName.Key}.focus();
+// -->
+</script>
+
+</form>
+</div>

Added: infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt
==============================================================================
--- (empty file)
+++ infrastructure/scarab/scarab-dpml-extensions/scarab-build-patch.txt Mon
Feb 21 22:07:58 2005
@@ -0,0 +1,48 @@
+Index: src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
+===================================================================
+--- src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
(revision 9419)
++++ src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
(working copy)
+@@ -152,7 +152,12 @@
+ */
+ public String getCustom()
+ {
+- return (customFile==null)? null:customFile.getAbsolutePath();
++ String result = null;
++ if ( customFile != null )
++ {
++ result = customFile.getAbsolutePath();
++ }
++ return result;
+ }
+
+ /**
+Index: src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
+===================================================================
+--- src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
(revision 9419)
++++ src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
(working copy)
+@@ -149,9 +149,7 @@
+ }
+ catch (FileNotFoundException e)
+ {
+- throw new BuildException("the template["
+- + generator.getTemplate()
+- + "] does not exist.");
++ throw new BuildException( "File not found: " + e.getMessage() );
+ }
+ catch (IOException e)
+ {
+Index: build/build.xml
+===================================================================
+--- build/build.xml (revision 9419)
++++ build/build.xml (working copy)
+@@ -267,8 +267,8 @@
+
classname="org.tigris.scarab.util.build.AntPropertyFileGenerator"
+ classpath="${build.project.webinf}/classes"/>
+ <defaultCustom
+- custom =
"${build.project.webinf}/conf/defaultCustom.properties"
+- template = "${custom.properties.tmpl}"
++ custom =
"${basedir}/${build.project.webinf}/conf/defaultCustom.properties"
++ template = "${basedir}/${custom.properties.tmpl}"
+ properties =
"${user.home}/scarab.${configuration.file}:${user.home}/${configuration.file}:${root.dir}/${configuration.file}:${root.dir}/project.properties"

+ />
+

Modified:
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/CommitHook.java
==============================================================================
---
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/CommitHook.java
(original)
+++
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/CommitHook.java
Mon Feb 21 22:07:58 2005
@@ -1,10 +1,9 @@
package net.dpml.tools.scarab.extensions;


-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Set;
import java.util.Vector;
+
import org.apache.xmlrpc.XmlRpcClient;

/**

Modified:
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/ScmHandler.java
==============================================================================
---
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/ScmHandler.java
(original)
+++
infrastructure/scarab/scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions/ScmHandler.java
Mon Feb 21 22:07:58 2005
@@ -1,15 +1,37 @@
package net.dpml.tools.scarab.extensions;

-import java.util.*;
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;

-import org.tigris.scarab.om.*;
-import org.tigris.scarab.services.cache.ScarabCache;
-import org.tigris.scarab.attribute.UserAttribute;
-import org.tigris.scarab.util.word.*;
-import org.tigris.scarab.util.IssueIdParser;
import org.apache.log4j.Category;
import org.apache.torque.util.Criteria;
+import org.tigris.scarab.om.ActivitySet;
+import org.tigris.scarab.om.Attachment;
+import org.tigris.scarab.om.Attribute;
+import org.tigris.scarab.om.AttributeOption;
+import org.tigris.scarab.om.AttributeValue;
+import org.tigris.scarab.om.GlobalParameter;
+import org.tigris.scarab.om.GlobalParameterManager;
+import org.tigris.scarab.om.Issue;
+import org.tigris.scarab.om.IssueManager;
+import org.tigris.scarab.om.IssuePeer;
+import org.tigris.scarab.om.MITList;
+import org.tigris.scarab.om.MITListManager;
+import org.tigris.scarab.om.Module;
+import org.tigris.scarab.om.ModuleManager;
+import org.tigris.scarab.om.ScarabUser;
+import org.tigris.scarab.om.ScarabUserManager;
+import org.tigris.scarab.services.cache.ScarabCache;
+import org.tigris.scarab.util.IssueIdParser;
+import org.tigris.scarab.util.word.IssueSearch;
+import org.tigris.scarab.util.word.IssueSearchFactory;
+import org.tigris.scarab.util.word.QueryResult;

/**
* Handles XML-RPC requests from the SCM.



  • svn commit: r1871 - in infrastructure/scarab: . scarab-dpml-extensions scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/classes scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/conf scarab-dpml-extensions/etc/deliverables/webapp/WEB-INF/templates/screens scarab-dpml-extensions/src/main/net/dpml/tools/scarab/extensions, pneubauer, 02/21/2005

Archive powered by MHonArc 2.6.24.

Top of Page