Update of
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring
In directory
james.mmbase.org:/tmp/cvs-serv25107/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring
Modified Files:
ResultContainer.java CloudFactory.java WizardController.java
SessionReadingCloudFactory.java NamePasswordCloudFactory.java
Log Message:
work in progress on the java code
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring
Index: ResultContainer.java
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/ResultContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ResultContainer.java 8 Sep 2008 16:52:10 -0000 1.2
+++ ResultContainer.java 22 Sep 2008 14:33:46 -0000 1.3
@@ -20,12 +20,11 @@
/**
- * De wizardservice geeft deze container als resultaat terug.
- * Het bevat een lijstje met errors (als deze zijn opgetreden),
- * en het geeft aan welk object nieuw is aangemaakt (zodat mogelijke
- * een pagina geopend kan worden met dat nieuwe object).
+ * this class acts as a wrapper for everything that needs to be passed to all
+ * the actions that need execution for a request.
*
* @author Rob Vermeulen (VPRO)
+ * @author Ernst Bunders
*/
public class ResultContainer {
private List<FieldError> fieldErrors = new ArrayList<FieldError>();
Index: CloudFactory.java
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/CloudFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CloudFactory.java 8 Sep 2008 16:52:10 -0000 1.2
+++ CloudFactory.java 22 Sep 2008 14:33:46 -0000 1.3
@@ -10,7 +10,7 @@
* @param request
* @return an mmbase transaction object.
*/
- public Transaction getTransaction( HttpServletRequest request);
+ public Transaction createTransaction( HttpServletRequest request);
}
Index: WizardController.java
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/WizardController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WizardController.java 8 Sep 2008 16:52:10 -0000 1.2
+++ WizardController.java 22 Sep 2008 14:33:46 -0000 1.3
@@ -37,7 +37,7 @@
private Locale locale;
public WizardController(){
- setLocale(new Locale("nl-NL"));
+ setLocale(new Locale("nl-NL"));/*default*/
}
@@ -54,9 +54,15 @@
request.setCharacterEncoding("UTF-8");
Command command = commandFactory.getNewInstance();
- Transaction transaction = cloudFactory.getTransaction(request);
+ Transaction transaction =
cloudFactory.createTransaction(request);
Map<String, Node> nodeMap = new HashMap<String, Node>();
+ if(log.isDebugEnabled()){
+ log.debug("*********************************");
+ log.debug("Processing new request with transaction
["+transaction.getName()+"]");
+ log.debug("*********************************");
+ }
+
// do the data binding
ServletRequestDataBinder binder = new
ServletRequestDataBinder(command);
binder.bind(request);
@@ -67,10 +73,12 @@
if (resultContainer.hasGlobalErrors() ||
resultContainer.hasFieldErrors()) {
log.debug("Errors found, transaction not committed.");
+ transaction.cancel();
} else {
- log.debug("No errors found. Commit the transaction and
put the cache flush hints on the request.");
- transaction.commit();
+ log.debug("No errors found. Commit transaction
["+transaction.getName()+"] and put the cache flush hints on the request.");
+ boolean result =
resultContainer.getTransaction().commit();
+
// create the request type cache flush hint
// TODO: maybe this type of cache flush hint is totally
useless. do
Index: SessionReadingCloudFactory.java
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/SessionReadingCloudFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SessionReadingCloudFactory.java 11 Aug 2008 13:03:30 -0000 1.1
+++ SessionReadingCloudFactory.java 22 Sep 2008 14:33:46 -0000 1.2
@@ -18,7 +18,7 @@
*/
public class SessionReadingCloudFactory implements CloudFactory {
- public Transaction getTransaction(HttpServletRequest request) {
+ public Transaction createTransaction(HttpServletRequest request) {
Cloud cloud = (Cloud)
request.getSession().getAttribute("cloud_mmbase");
if(cloud != null){
return cloud.getTransaction("vpro-wizards-controller");
Index: NamePasswordCloudFactory.java
===================================================================
RCS file:
/var/cvs/speeltuin/ernst/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/NamePasswordCloudFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NamePasswordCloudFactory.java 11 Aug 2008 13:03:30 -0000 1.1
+++ NamePasswordCloudFactory.java 22 Sep 2008 14:33:46 -0000 1.2
@@ -36,7 +36,7 @@
return LocalContext.getCloudContext().getCloud("een", "twee",
credentials );
}
- public Transaction getTransaction(HttpServletRequest request) {
+ public Transaction createTransaction(HttpServletRequest request) {
//TODO: what is the parameter for?
return getCloud().getTransaction("transaction");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
