WebSVN – XServices – Diff – /SVN-ALFEventEmitter/trunk/src/net/brutex/emitter/ALFEmitter.java

 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import net.brutex.sbm.sbmappservices72.api.MultipleResponseItemOptions;
 import net.brutex.sbm.sbmappservices72.api.ObjectFactory;
 import net.brutex.sbm.sbmappservices72.api.SectionsOption;
 import net.brutex.sbm.sbmappservices72.api.TTItemList;
 import net.brutex.sbm.sbmappservices72.api.TableIdentifier;
+import net.brutex.svn.SVNAdminCommand;
+import net.brutex.svn.SVNAdminExecutor;
 import net.brutex.svn.SVNCommitInfo;
 import net.brutex.svn.SVNLookExecutor;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.cxf.message.Message;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.log4j.Logger;
 import org.jaxen.JaxenException;
+import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
 /**
  * The Class ALFEmitter.
 	//
 	// Keys to read from the configuration file.
 	//
+	private static final String OPTION_SVNLOOK = "svnlook";
-	private static final String OPTION_SVNLOOK = "svnlook";
+	private static final String OPTION_SVNADMIN = "svnadmin";
 	private static final String OPTION_LOCALE = "env.LANG";
 	private static final String OPTION_ENCODING = "env.encoding";
 	private static final String OPTION_ISSUEPATTERN = "issuepattern";
 	private static final String OPTION_IS_SOAPENABLED = "isSoapEnabled";
 	private static final String OPTION_IS_DROPENABLED = "isDropResponse";
 	private static final String OPTION_IS_FORCEFAILENABLED = "forcefail";
+	private static final String OPTION_IS_VERIFICATIONENABLED = "isWithVerification";
-	private static final String OPTION_IS_VERIFICATIONENABLED = "isWithVerification";
+	private static final String OPTION_IS_UPDATECOMMITMESSAGE = "isWithMessageUpdate";
 	private static final String OPTION_IS_WSTRACE = "trace";
 	private static final String OPTION_IS_XMLPROCESSINGENABLED = "isXmlProcessingEnabled";
 	private final String querytable;
 	private final String query;
+	private final List<String> internalissues = new ArrayList<String>();
 	//SBM IssueTypePrefix+IssueId, Title
-	private final List<String> internalissues = new ArrayList<String>();
+	private final Map<String, String> issues_titles = new HashMap<String, String>();
 	/**
+		}
 		try {
 			ALFEmitter emitter = new ALFEmitter(cmd, startTime);
 		} catch (ConfigurationException e) {
 			System.exit(1);
+		} catch (MalformedURLException e) {
+			logger.error("Could not find/ load wsdl url.", e);
+			System.exit(1);
+		}
 		long endTime = System.currentTimeMillis();
 		logger.debug("Total execution took '"+(endTime-startTime)+"' milliseconds.");
 		System.exit(0);
+	}
 	private boolean readConfPropertyAsBoolean(String key, boolean defaultValue, boolean isRequired, String logmessage) throws ConfigurationException {
 		Boolean b =  (Boolean) readConfProperty(key, defaultValue, isRequired, PropertyType.BOOLEAN, logmessage);
 		return b.booleanValue();
+	}
-	private ALFEmitter(CommandLine cmd, long startTime) throws ConfigurationException {
+	private ALFEmitter(CommandLine cmd, long startTime) throws ConfigurationException, MalformedURLException {
 		this.startTime = startTime;
 		repos = cmd.getOptionValue(PARAM_REPOS);
 		txn = cmd.getOptionValue(PARAM_TXN);
 		rev = cmd.getOptionValue(PARAM_REV);
 		config = null;
 		try {
 			config = new PropertiesConfiguration(config_file);
 		} catch (ConfigurationException e) {
 			logger.error("Could not find/ load '"+config_file+"' file.", e);
-			System.exit(1);
+			this.exit(1);
+		}
 		/*
 		 * Load Properties from Configuration file
 			// Flags to indicate what should be done
 			final boolean isSoapEnabled 	= readConfPropertyAsBoolean(OPTION_IS_SOAPENABLED, true, true, null);
 			final boolean isXmlProcessingEnabled 	= readConfPropertyAsBoolean(OPTION_IS_XMLPROCESSINGENABLED, true, true, null);
 			final boolean isWithVerification= readConfPropertyAsBoolean(OPTION_IS_VERIFICATIONENABLED, false, true, null);
 			final boolean isRemoveIssues	= readConfPropertyAsBoolean(OPTION_REMOVE_ISSUES_FROM_COMMIT, false, true, "");
+			final boolean isWithCommitUpdate= readConfPropertyAsBoolean(OPTION_IS_UPDATECOMMITMESSAGE, false, true, "");
 			/*
 			 * SVNLook phase
 			 * Use svnlook to obtain information from SVN
 				logger.debug(String.format("Starting verification for '%s' issues in the list.", info.getIssues().size()));
 				boolean isOK = verify(info.getIssues(), isTrace);
 				if(! isOK ) {
 					logger.error("Verification of issue failed. No matching issue was found.");
-					System.exit(1);
+					this.exit(1);
+				}
 			} else {
 				sbm_user = null; sbm_pass=null; endpoint=null; querytable=null; query=null;
+			}
+			/*
+			 * Modify original commit message
+			 * using svnadmin command
+			 */
+			if(isWithCommitUpdate) {
+				String svnadmin = readConfPropertyAsString(OPTION_SVNADMIN, null, true, null);
+				EmitterUtil.verifyFile(svnadmin, false, true);
+				/* If verification was turned on, we do already have the titles
+				 * so only try to load the items when verification was off
+				 */
+				if(! isWithVerification) {
+					verify(info.getIssues(), isTrace);
+				}
+				/* Append associated items information and change log message */
+				StringBuffer newmessage = new StringBuffer();
+				newmessage.append(info.getLogmessage());
+				newmessage.append("\n\n Associated SBM items:\n");
+				for(String s : issues_titles.keySet()) {
+					newmessage.append(s+": ");
+					newmessage.append(issues_titles.get(s));
+					newmessage.append("\n");
+				}
+				postCommitUpdate(new File(svnadmin), repos, locale, encoding, rev, newmessage.toString());
+			}
 			/*
 			 * XML processing phase
 			 */
-			if(isXmlProcessingEnabled) {
+			if(isXmlProcessingEnabled) {
+			}
+			}
 		} catch (FileNotFoundException e) {
 			logger.error(e.getMessage(), e);
-			System.exit(1);
+			this.exit(1);
 		} catch (ClientProtocolException e) {
 			logger.error(e.getMessage(), e);
-			System.exit(1);
+			this.exit(1);
 		} catch (IOException e) {
 			logger.error(e.getMessage(), e);
-			System.exit(1);
+			this.exit(1);
 		} catch (XMLStreamException e) {
 			logger.error(e.getMessage(), e);
-			System.exit(1);
+			this.exit(1);
 		} catch (JaxenException e) {
 			logger.error(e.getMessage(), e);
-			System.exit(1);
-		} finally {
+			this.exit(1);
-			logger.debug("Total execution took '"+(System.currentTimeMillis()-startTime)+"' milliseconds.");
+		} finally {
 			String forcefail = config.getString(OPTION_IS_FORCEFAILENABLED, "");
 			if(forcefail.length()>0) {
 				logger.warn("Force fail is active. All commits will be blocked.");
-				System.exit(1);
+				this.exit(1);
+			}
 			try {
 				template = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(new File(eventtemplate)))
 						.getDocument().getOMDocumentElement();
 			} catch (FileNotFoundException e1) {
 				logger.error(String.format("Could not load XML event template from file '%s'.", eventtemplate), e1);
-				System.exit(1);
+				this.exit(1);
+			}
 			nss 	= 	readConfPropertyAsString(OPTION_EVENTNAMESPACE, "http://www.eclipse.org/alf/schema/EventBase/1", true, null);
 			final String marker_logmessage 	= 	readConfPropertyAsString(OPTION_MARKER_LOGMESSAGE, "@@logmessage@@", true, null);
 			final String marker_author 		= 	readConfPropertyAsString(OPTION_MARKER_AUTHOR, "@@author@@", true, null);
 			final String marker_revision	= 	readConfPropertyAsString(OPTION_MARKER_REVISION, "@@revision@@", true, null);
 			addElements(marker_issues, info.getIssues(), marker_issueselementname);
 			addElements(marker_internalissues, internalissues, marker_issueselementname);
 		}
+		private boolean verify(List<String> issues, boolean isTrace) throws MalformedURLException {
+			for(String issueid : issues) {
+				TTItemList items = getTTItems(issueid, isTrace);
+				if(items == null) {
+					return false;
+				}
+			}
+			return true;
+	}
+		private TTItemList getTTItems(String issueid, boolean isTrace) throws MalformedURLException {
+			long startTime = System.currentTimeMillis();
+			/* -- */
-		private boolean verify(List<String> issues, boolean isTrace) {
+			Sbmappservices72 ss = new Sbmappservices72(ClassLoader.getSystemResource("sbmappservices72.wsdl") );
-			Sbmappservices72 ss = new Sbmappservices72(ClassLoader.getSystemResource("sbmappservices72.wsdl") );
+			logger.debug("Total execution of sbmappservices72 wsdl read took '"+(System.currentTimeMillis()-startTime)+"' milliseconds.");
 			Sbmappservices72PortType port = ss.getSbmappservices72();
 			Client client = ClientProxy.getClient(port);
 			if(isTrace) {
 		        client.getInInterceptors().add(new LoggingInInterceptor());
 		        client.getOutInterceptors().add(new LoggingOutInterceptor());
+			}
+			BindingProvider bindingProvider = (BindingProvider) port;
-			}
+	        bindingProvider.getRequestContext().put(
-			BindingProvider bindingProvider = (BindingProvider) port;
+	        BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpoint);
-	        bindingProvider.getRequestContext().put(
+	        /* -- */
-	        BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpoint);
+	        logger.debug("Total execution of sbmappservices72 initialisation took '"+(System.currentTimeMillis()-startTime)+"' milliseconds.");
 			ObjectFactory fac = new ObjectFactory();
 			Auth auth = fac.createAuth();
 			auth.setUserId(fac.createAuthUserId(sbm_user));
+			auth.setPassword(fac.createAuthPassword(sbm_pass));
-			auth.setPassword(fac.createAuthPassword(sbm_pass));
 			TableIdentifier table = fac.createTableIdentifier();
 			table.setDbName(fac.createTableIdentifierDbName(querytable));
+			MultipleResponseItemOptions options = fac.createMultipleResponseItemOptions();
-			MultipleResponseItemOptions options = fac.createMultipleResponseItemOptions();
+			options.setSpecifiedSections(fac.createResponseItemOptionsSpecifiedSections("SECTION:FIXED"));
-			options.setSections(SectionsOption.SECTIONS_NONE);
+			options.setSections(SectionsOption.SECTIONS_SPECIFIED);
+			issueid = issueid.replaceAll("[^0-9]", "");
+			String queryWhereClause = "TS_ISSUEID = '"+issueid+"'";
-			for(String issue : issues) {
+			if(query!=null && query.length()>0) queryWhereClause = queryWhereClause + " And " + query;
-				issue = issue.replaceAll("[^0-9]", "");
+			TTItemList items = null;
-				String queryWhereClause = "TS_ISSUEID = '"+issue+"'";
+			logger.debug(String.format("Using query against table '%s'. Query where clause: '%s'", querytable, queryWhereClause ));
-				if(query!=null && query.length()>0) queryWhereClause = queryWhereClause + " And " + query;
+			try {
-				logger.debug(String.format("Using query against table '%s'. Query where clause: '%s'", querytable, queryWhereClause ));
+					startTime = System.currentTimeMillis();
-				try {
+					items = port.getItemsByQuery(auth, table, queryWhereClause, "", null, BigInteger.valueOf(1), options);
-					TTItemList items = port.getItemsByQuery(auth, table, queryWhereClause, "", null, BigInteger.valueOf(1), options);
+					logger.debug("Total execution of sbmappservices72 GetItems took '"+(System.currentTimeMillis()-startTime)+"' milliseconds.");
 					//Marshaller m = JAXBContext.newInstance(TTItemList.class).createMarshaller();
 					//m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+					//m.marshal( new JAXBElement<TTItemList>(new QName("uri","local"), TTItemList.class, items), System.err);
 					//m.marshal( new JAXBElement<TTItemList>(new QName("uri","local"), TTItemList.class, items), System.err);
+					logger.debug(String.format("Got Response from getItemsByQuery"));
+					if(items!=null) {
+						logger.debug(String.format("Verification query matched '%s' item(s) for issue '%s.'",items.getTotalCount(), issueid));
+					}
 					if(items.getTotalCount().intValue()<=0) {
-					logger.debug(String.format("Got Response from getItemsByQuery"));
+						return null;
-					if(items!=null) {
+					} else {
-						logger.debug(String.format("Verification query matched '%s' item(s) for issue '%s.'",items.getTotalCount(), issue));
+						/* store internal ids (tableid:itemid) */
 						internalissues.add(items.getItem().get(0).getId().getValue().getTableIdItemId().getValue());
-					if(items.getTotalCount().intValue()<=0) {
-						return false;
+						/* Store a map entry with internal id and title */
-					} else {
+						issues_titles.put(items.getItem().get(0).getId().getValue().getDisplayName().getValue(),
+											items.getItem().get(0).getTitle().getValue());
+					}
+			} catch (AEWebservicesFaultFault e) {
+					logger.debug("Web service fault: " + e.getFaultInfo());
+			} catch (Exception e) {
+					logger.debug("Unknown Exception", e);
-						internalissues.add(items.getItem().get(0).getId().getValue().getTableIdItemId().getValue());
+			}
 			return items;
+		}
 				} catch (AEWebservicesFaultFault e) {
-					logger.debug("Web service fault: " + e.getFaultInfo());
+		private void postCommitUpdate(File svnadmin, String repos, String locale, String encoding, String revision, String newmessage) {
 			OMComment n = (OMComment) path.selectSingleNode(template);
 			if(n!=null) return n;
 			logger.warn("Comment '"+pattern+"' was not found in the XML template.");
 			return null;
+		}
+	private void exit(int errorCode) {
+		long endTime = System.currentTimeMillis();
+		logger.debug("Total execution took '"+(endTime-startTime)+"' milliseconds.");
+		System.exit(errorCode);
+	}
 	@SuppressWarnings("static-access")
 	private static Options getOptions() {
 		Option repository = OptionBuilder.withArgName( "repository" )
 	private static void printHelp() {
 		// automatically generate the help statement
 		HelpFormatter formatter = new HelpFormatter();
 		String header = "\nSVN-ALFEventEmitter " + VERSION +", a SVN hook implemented in Java to emit Eclipse ALFEvents on commit.\n\n";
-		String footer = "Please send bug reports to bru@brutex.de.\n(c)2013 Brian Rosenberger";
+		String footer = "Please send bug reports to bru@brutex.de.\n(c)2014 Brian Rosenberger";
 		formatter.printHelp("java -jar SVN-ALFEventEmitter", header, getOptions(), footer, true);

Subversion Repositories XServices

(root)/SVN-ALFEventEmitter/trunk/src/net/brutex/emitter/ALFEmitter.java @ 184 – Rev 153 → 167