[jira] [Created] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-06 Thread JIRA
Robin Böhm created MTOMCAT-174:
--

 Summary: tomcatConfigurationFilesDirectory is not implemented
 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)


Hey Ya :)

the property tomcatConfigurationFilesDirectory is not implemented yet.
There is just a field declaration without any handling.

Ive written a quick patch for my own project that i assign on this issue.
Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[jira] [Updated] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-06 Thread JIRA

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-174?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Robin Böhm updated MTOMCAT-174:
---

Attachment: patch.diff

simple patch for my project.
may could help :)

 tomcatConfigurationFilesDirectory is not implemented
 

 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)
 Attachments: patch.diff


 Hey Ya :)
 the property tomcatConfigurationFilesDirectory is not implemented yet.
 There is just a field declaration without any handling.
 Ive written a quick patch for my own project that i assign on this issue.
 Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

2012-09-06 Thread Gump
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 57 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency httpunit failed with reason build failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
 to 
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing 
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing 
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO] 
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO] 
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking 
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 

[Bug 53836] New: This question is about Bug ID 40000

2012-09-06 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53836

  Priority: P2
Bug ID: 53836
  Assignee: dev@tomcat.apache.org
   Summary: This question is about Bug ID 4
  Severity: normal
Classification: Unclassified
OS: Linux
  Reporter: npun...@consultantemail.com
  Hardware: PC
Status: NEW
   Version: 7.0.26
 Component: Catalina
   Product: Tomcat 7

There was a workaround provided for this situation with Tomcat version 5.5.
Just wanted to confirm if it was ever fixed in the later versions. 

We are suspecting a similar issue in our environment with Tomcat 7.0.26 and
would like to know the following:

Under a situation where Tomcat's active jdbc connections = maxActive and
maxWait=-1, if Tomcat stops responding, what would be the status of the
Tomcat manager application. Will it be accessible? This will confirm if we are
hitting this bug or not as the regular application was not accessible during
the Incident but Tomcat manager application was accessible. We had to restart
the Tomcat instance to fix the situation.

Here's our config:

Resource name=
auth=Container
type=javax.sql.DataSource
driverClassName=oracle.jdbc.OracleDriver
url=jdbc:oracle:thin:@xx:1523:SID
username=some_user
password=xxx
maxActive=12
validationQuery=SELECT 1 FROM DUAL
accessToUnderlyingConnectionAllowed=true
testOnBorrow=true
maxIdle=10
maxWait=-1 /

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53836] This question is about Bug ID 40000

2012-09-06 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53836

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas ma...@apache.org ---
Bugzilla is not a support forum where you can ask questions. That is what the
users mailing list is for.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53836] This question is about Bug ID 40000

2012-09-06 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53836

--- Comment #2 from Nikhil npun...@consultantemail.com ---

Hello,

Thanks for your response. I have mailed Armin who reported 4, about the
issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381587 - in /tomcat/site/trunk: ./ docs/ xdocs/

2012-09-06 Thread markt
Author: markt
Date: Thu Sep  6 12:59:47 2012
New Revision: 1381587

URL: http://svn.apache.org/viewvc?rev=1381587view=rev
Log:
Update for 7.0.30 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1381587r1=1381586r2=1381587view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Thu Sep  6 12:59:47 2012
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat55=5.5.35
 tomcat60=6.0.35
-tomcat70=7.0.29
+tomcat70=7.0.30
 
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1381587r1=1381586r2=1381587view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Sep  6 12:59:47 2012
@@ -55,8 +55,8 @@
 release
   Version
 nameLatest Stable 7.0.x Release/name
-created2012-07-08/created
-revision7.0.29/revision
+created2012-09-06/created
+revision7.0.30/revision
   /Version
 /release
 release

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1381587r1=1381586r2=1381587view=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Thu Sep  6 12:59:47 2012
@@ -218,8 +218,8 @@
 blockquote
 
 a href=http://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a |
-a href=#7.0.297.0.29/a |
-a href=[preferred]tomcat/tomcat-7/v7.0.29 rel=nofollowBrowse/a 
|
+a href=#7.0.307.0.30/a |
+a href=[preferred]tomcat/tomcat-7/v7.0.30 rel=nofollowBrowse/a 
|
 a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a
   
 /blockquote
@@ -307,7 +307,7 @@
 /table
 table border=0 cellspacing=0 cellpadding=2 width=100%
 tr
-td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa 
name=7.0.29strong7.0.29/strong/a/font/td
+td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa 
name=7.0.30strong7.0.30/strong/a/font/td
 /tr
 tr
 td
@@ -316,8 +316,8 @@
   
 p
   
-a name=7.0.29Please/a see the 
-  a href=[preferred]tomcat/tomcat-7/v7.0.29/README.html 
rel=nofollowREADME/a
+a name=7.0.30Please/a see the 
+  a href=[preferred]tomcat/tomcat-7/v7.0.30/README.html 
rel=nofollowREADME/a
   file for packaging information.  It explains what every distribution 
contains.
   /p
 
@@ -338,44 +338,44 @@
   
 li
 
-a href=[preferred]tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.zip 
rel=nofollowzip/a 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.zip.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.zip.md5;md5/a)
+a href=[preferred]tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.zip 
rel=nofollowzip/a 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.zip.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.zip.md5;md5/a)
   /li
   
 li
 
-a href=[preferred]tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.tar.gz 
rel=nofollowtar.gz/a 
-(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.tar.gz.asc;pgp/a,
 
-a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29.tar.gz.md5;md5/a)
+a href=[preferred]tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.tar.gz 
rel=nofollowtar.gz/a 
+(a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.tar.gz.asc;pgp/a,
 
+a 
href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.30/bin/apache-tomcat-7.0.30.tar.gz.md5;md5/a)
   /li
   
 li
 
-a 
href=[preferred]tomcat/tomcat-7/v7.0.29/bin/apache-tomcat-7.0.29-windows-x86.zip
 rel=nofollow32-bit Windows zip/a 
-(a 

svn commit: r1381586 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2012-09-06 Thread markt
Author: markt
Date: Thu Sep  6 12:58:29 2012
New Revision: 1381586

URL: http://svn.apache.org/viewvc?rev=1381586view=rev
Log:
Update Tomcat 7 docs for 7.0.30


[This commit notification would consist of 57 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[ANN] Apache Tomcat 7.0.30 released

2012-09-06 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 7.0.30.

Apache Tomcat is an open source software implementation of the Java
Servlet and JavaServer Pages technologies.

This release contains numerous bug fixes and improvements compared to
version 7.0.29. The notable changes include:
- Significantly reduced memory footprint during web application start
  while Servlet 3.0 annotation and SCI scanning is in progress.
- Adds support for scanning of classes that use Java 7 specific byte
  code for Servlet 3.0 annotation and SCI scanning.
- Improvements to DIGEST and FORM authentication.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Note: This version has 4 zip binaries: a generic one and three
  bundled with Tomcat native binaries for Windows operating systems
  running on different CPU architectures.

Note: If you use the APR/native AJP or HTTP connector you *must* upgrade
  to version 1.1.24 or later of the AJP/native library

Downloads:
http://tomcat.apache.org/download-70.cgi

Migration guides from Apache Tomcat 5.5.x and 6.0.x:
http://tomcat.apache.org/migration.html

Thank you,

-- The Apache Tomcat Team

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381623 - /tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java

2012-09-06 Thread schultz
Author: schultz
Date: Thu Sep  6 14:27:42 2012
New Revision: 1381623

URL: http://svn.apache.org/viewvc?rev=1381623view=rev
Log:
No functional change: a bit of clean-up before adding a new feature.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1381623r1=1381622r2=1381623view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Thu Sep  
6 14:27:42 2012
@@ -21,10 +21,13 @@ import java.io.PrintWriter;
 import java.util.Set;
 
 import javax.management.Attribute;
+import javax.management.MBeanException;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.management.OperationsException;
+import javax.management.ReflectionException;
 import javax.management.openmbean.CompositeData;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -44,6 +47,10 @@ public class JMXProxyServlet extends Htt
 
 private static final long serialVersionUID = 1L;
 
+// Constant for no parameters when invoking a JMX operation
+// without any parameters.
+private static final String[] NO_PARAMETERS = new String[0];
+
 // - Instance Variables
 /**
  * MBean server.
@@ -77,7 +84,6 @@ public class JMXProxyServlet extends Htt
   HttpServletResponse response)
 throws IOException, ServletException
 {
-
 response.setContentType(text/plain);
 
 PrintWriter writer = response.getWriter();
@@ -104,14 +110,8 @@ public class JMXProxyServlet extends Htt
 qry = request.getParameter(invoke);
 if(qry != null) {
 String opName=request.getParameter(op);
-String ps = request.getParameter(ps);
-String[] valuesStr;
-if (ps == null) {
-valuesStr = new String[0];
-} else {
-valuesStr = ps.split(,);
-}
-invokeOperation( writer, qry, opName,valuesStr );
+String[] params = getInvokeParameters(request.getParameter(ps));
+invokeOperation(writer, qry, opName, params);
 return;
 }
 qry=request.getParameter(qry);
@@ -120,7 +120,6 @@ public class JMXProxyServlet extends Htt
 }
 
 listBeans( writer, qry );
-
 }
 
 public void getAttribute(PrintWriter writer, String onameStr, String att, 
String key) {
@@ -162,10 +161,7 @@ public class JMXProxyServlet extends Htt
   String onameStr, String att, String val )
 {
 try {
-ObjectName oname=new ObjectName( onameStr );
-String type=registry.getType(oname, att);
-Object valueObj=registry.convertValue(type, val );
-mBeanServer.setAttribute( oname, new Attribute(att, valueObj));
+setAttributeInternal(onameStr, att, val);
 writer.println(OK - Attribute set);
 } catch( Exception ex ) {
 writer.println(Error -  + ex.toString());
@@ -205,18 +201,7 @@ public class JMXProxyServlet extends Htt
 private void invokeOperation(PrintWriter writer, String onameStr, String 
op,
 String[] valuesStr) {
 try {
-ObjectName oname=new ObjectName( onameStr );
-MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,op);
-MBeanParameterInfo[] signature = methodInfo.getSignature();
-String[] signatureTypes = new String[signature.length];
-Object[] values = new Object[signature.length];
-for (int i = 0; i  signature.length; i++) {
-   MBeanParameterInfo pi = signature[i];
-   signatureTypes[i] = pi.getType();
-   values[i] = registry.convertValue(pi.getType(), valuesStr[i] );
-   }
-
-Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
+Object retVal = invokeOperationInternal(onameStr, op, valuesStr);
 if (retVal != null) {
 writer.println(OK - Operation  + op +  returned:);
 output(, writer, retVal);
@@ -229,6 +214,62 @@ public class JMXProxyServlet extends Htt
 }
 }
 
+
+/**
+ * Parses parameter values from a parameter string.
+ * @param paramString The string containing comma-separated
+ *operation-invocation parameters, or
+ *codenull/code if there are no parameters.
+ * @return An array of String parameters (empty array if
+ * 

svn commit: r1381634 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java

2012-09-06 Thread schultz
Author: schultz
Date: Thu Sep  6 15:05:54 2012
New Revision: 1381634

URL: http://svn.apache.org/viewvc?rev=1381634view=rev
Log:
No functional change: a bit of clean-up before adding a new feature.


Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1381623

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1381634r1=1381633r2=1381634view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
Thu Sep  6 15:05:54 2012
@@ -21,10 +21,13 @@ import java.io.PrintWriter;
 import java.util.Set;
 
 import javax.management.Attribute;
+import javax.management.MBeanException;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.management.OperationsException;
+import javax.management.ReflectionException;
 import javax.management.openmbean.CompositeData;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -44,6 +47,10 @@ public class JMXProxyServlet extends Htt
 
 private static final long serialVersionUID = 1L;
 
+// Constant for no parameters when invoking a JMX operation
+// without any parameters.
+private static final String[] NO_PARAMETERS = new String[0];
+
 // - Instance Variables
 /**
  * MBean server.
@@ -77,7 +84,6 @@ public class JMXProxyServlet extends Htt
   HttpServletResponse response)
 throws IOException, ServletException
 {
-
 response.setContentType(text/plain);
 
 PrintWriter writer = response.getWriter();
@@ -104,14 +110,8 @@ public class JMXProxyServlet extends Htt
 qry = request.getParameter(invoke);
 if(qry != null) {
 String opName=request.getParameter(op);
-String ps = request.getParameter(ps);
-String[] valuesStr;
-if (ps == null) {
-valuesStr = new String[0];
-} else {
-valuesStr = ps.split(,);
-}
-invokeOperation( writer, qry, opName,valuesStr );
+String[] params = getInvokeParameters(request.getParameter(ps));
+invokeOperation(writer, qry, opName, params);
 return;
 }
 qry=request.getParameter(qry);
@@ -120,7 +120,6 @@ public class JMXProxyServlet extends Htt
 }
 
 listBeans( writer, qry );
-
 }
 
 public void getAttribute(PrintWriter writer, String onameStr, String att, 
String key) {
@@ -162,10 +161,7 @@ public class JMXProxyServlet extends Htt
   String onameStr, String att, String val )
 {
 try {
-ObjectName oname=new ObjectName( onameStr );
-String type=registry.getType(oname, att);
-Object valueObj=registry.convertValue(type, val );
-mBeanServer.setAttribute( oname, new Attribute(att, valueObj));
+setAttributeInternal(onameStr, att, val);
 writer.println(OK - Attribute set);
 } catch( Exception ex ) {
 writer.println(Error -  + ex.toString());
@@ -205,18 +201,7 @@ public class JMXProxyServlet extends Htt
 private void invokeOperation(PrintWriter writer, String onameStr, String 
op,
 String[] valuesStr) {
 try {
-ObjectName oname=new ObjectName( onameStr );
-MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,op);
-MBeanParameterInfo[] signature = methodInfo.getSignature();
-String[] signatureTypes = new String[signature.length];
-Object[] values = new Object[signature.length];
-for (int i = 0; i  signature.length; i++) {
-   MBeanParameterInfo pi = signature[i];
-   signatureTypes[i] = pi.getType();
-   values[i] = registry.convertValue(pi.getType(), valuesStr[i] );
-   }
-
-Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
+Object retVal = invokeOperationInternal(onameStr, op, valuesStr);
 if (retVal != null) {
 writer.println(OK - Operation  + op +  returned:);
 output(, writer, retVal);
@@ -229,6 +214,62 @@ public class JMXProxyServlet extends Htt
 }
 }
 
+
+/**
+ * Parses parameter values from a parameter string.
+ * @param paramString The string 

svn commit: r1381635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml

2012-09-06 Thread schultz
Author: schultz
Date: Thu Sep  6 15:08:58 2012
New Revision: 1381635

URL: http://svn.apache.org/viewvc?rev=1381635view=rev
Log:
Added multi-op modes to JMXProxyServlet.


Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1381633

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1381635r1=1381634r2=1381635view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
Thu Sep  6 15:08:58 2012
@@ -93,33 +93,98 @@ public class JMXProxyServlet extends Htt
 return;
 }
 
-String qry=request.getParameter(set);
-if( qry!= null ) {
-String name=request.getParameter(att);
-String val=request.getParameter(val);
-
-setAttribute( writer, qry, name, val );
-return;
+// Invoke an operation, then execute a get
+if(null != request.getParameter(invokeAndGet)) {
+try {
+invokeOperationInternal(request.getParameter(invoke),
+request.getParameter(op),
+
getInvokeParameters(request.getParameter(ps)));
+
+getAttribute(writer,
+ request.getParameter(get),
+ request.getParameter(att),
+ request.getParameter(key));
+} catch (Exception e) {
+writer.println(Error -  + e.toString());
+e.printStackTrace(writer);
+}
 }
-qry=request.getParameter(get);
-if( qry!= null ) {
-String name=request.getParameter(att);
-getAttribute( writer, qry, name, request.getParameter(key) );
-return;
+// Get a value first, then invoke an operation
+else if(null != request.getParameter(getAndInvoke)) {
+try {
+getAttribute(writer,
+ request.getParameter(get),
+ request.getParameter(att),
+ request.getParameter(key));
+
+invokeOperationInternal(request.getParameter(invoke),
+request.getParameter(op),
+
getInvokeParameters(request.getParameter(ps)));
+} catch (Exception e) {
+writer.println(Error -  + e.toString());
+e.printStackTrace(writer);
+}
 }
-qry = request.getParameter(invoke);
-if(qry != null) {
-String opName=request.getParameter(op);
-String[] params = getInvokeParameters(request.getParameter(ps));
-invokeOperation(writer, qry, opName, params);
-return;
-}
-qry=request.getParameter(qry);
-if( qry == null ) {
-qry = *:*;
+// Invoke an operation, then set a value
+else if(null != request.getParameter(invokeAndSet)) {
+try {
+invokeOperationInternal(request.getParameter(invoke),
+request.getParameter(op),
+
getInvokeParameters(request.getParameter(ps)));
+
+setAttribute(writer,
+ request.getParameter(set),
+ request.getParameter(att),
+ request.getParameter(val));
+} catch (Exception e) {
+writer.println(Error -  + e.toString());
+e.printStackTrace(writer);
+}
 }
+// Get a value, then set its value
+else if(null != request.getParameter(getAndSet)) {
+try {
+getAttribute(writer,
+ request.getParameter(get),
+ request.getParameter(att),
+ request.getParameter(key));
+
+setAttributeInternal(request.getParameter(set),
+ request.getParameter(att),
+ request.getParameter(val));
+} catch (Exception e) {
+writer.println(Error -  + e.toString());
+e.printStackTrace(writer);
+}
+} else {
+String 

[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase

2012-09-06 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294

--- Comment #15 from j...@urbancode.com ---
Not expanding and having no option to expand external war files is a major
inconvenience for us as well.
The fact that the unpackWAR attribute in the context, when explicitly set to
true, does not result in the war being unpacked is very unintuitive.  It would
normally expect that an explicit setting on that should trump all other
defaults/behavior.

However as a workaround, I have found that making an appropriately named
symlink inside the webapps directory pointing to the external war seems to
suffice.  This may be an acceptable long term solution.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381726 - /tomcat/trunk/webapps/docs/manager-howto.xml

2012-09-06 Thread markt
Author: markt
Date: Thu Sep  6 19:30:57 2012
New Revision: 1381726

URL: http://svn.apache.org/viewvc?rev=1381726view=rev
Log:
whitespace police

Modified:
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1381726r1=1381725r2=1381726view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Thu Sep  6 19:30:57 2012
@@ -1368,7 +1368,7 @@ http://webserver/manager/jmxproxy/?invok
 p
   Note that you can use different target MBeans if you want to, because
   the codeinvoke/code and codeset/code parameters can obviously
-  have different values. 
+  have different values.
 /p
   /subsection
   subsection name=Invoke and get anchor=invokeAndGet
@@ -1384,7 +1384,7 @@ http://webserver/manager/jmxproxy/?invok
 p
   Note that you can use different target MBeans if you want to, because
   the codeinvoke/code and codeget/code parameters can obviously
-  have different values. 
+  have different values.
 /p
   /subsection
   subsection name=Get and invoke anchor=getAndInvoke
@@ -1407,7 +1407,7 @@ http://webserver/manager/jmxproxy?getAnd
 p
   Note that you can use different target MBeans if you want to, because
   the codeinvoke/code and codeget/code parameters can obviously
-  have different values. 
+  have different values.
 /p
   /subsection
   subsection name=Get and set anchor=getAndSet



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[jira] [Updated] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-06 Thread *$^¨%`£

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-174?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy (*$^¨%`£) updated MTOMCAT-174:
---

Component/s: (was: tomcat6)

 tomcatConfigurationFilesDirectory is not implemented
 

 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)
 Attachments: patch.diff


 Hey Ya :)
 the property tomcatConfigurationFilesDirectory is not implemented yet.
 There is just a field declaration without any handling.
 Ive written a quick patch for my own project that i assign on this issue.
 Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381781 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-09-06 Thread olamy
Author: olamy
Date: Thu Sep  6 22:18:30 2012
New Revision: 1381781

URL: http://svn.apache.org/viewvc?rev=1381781view=rev
Log:
[MTOMCAT-174] tomcatConfigurationFilesDirectory is not implemented

Submitted by Robin Böhm.

Modified:

tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1381781r1=1381780r2=1381781view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
 Thu Sep  6 22:18:30 2012
@@ -47,6 +47,7 @@ import org.codehaus.plexus.util.Director
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -68,45 +69,45 @@ public abstract class AbstractExecWarMoj
 extends AbstractTomcat7Mojo
 {
 
-@Parameter( defaultValue = ${project.artifact}, required = true, 
readonly = true )
+@Parameter ( defaultValue = ${project.artifact}, required = true, 
readonly = true )
 private Artifact projectArtifact;
 
 /**
  * The maven project.
  */
-@Parameter( defaultValue = ${project}, required = true, readonly = true )
+@Parameter ( defaultValue = ${project}, required = true, readonly = true 
)
 protected MavenProject project;
 
-@Parameter( defaultValue = ${plugin.artifacts}, required = true )
+@Parameter ( defaultValue = ${plugin.artifacts}, required = true )
 private ListArtifact pluginArtifacts;
 
-@Parameter( defaultValue = ${project.build.directory} )
+@Parameter ( defaultValue = ${project.build.directory} )
 private File buildDirectory;
 
 /**
  * Path under {@link #buildDirectory} where this mojo may do temporary 
work.
  */
-@Parameter( defaultValue = 
${project.build.directory}/tomcat7-maven-plugin-exec )
+@Parameter ( defaultValue = 
${project.build.directory}/tomcat7-maven-plugin-exec )
 private File pluginWorkDirectory;
 
-@Parameter( property = maven.tomcat.exec.war.tomcatConf, defaultValue = 
src/main/tomcatconf )
+@Parameter ( property = maven.tomcat.exec.war.tomcatConf, defaultValue = 
src/main/tomcatconf )
 private File tomcatConfigurationFilesDirectory;
 
-@Parameter( defaultValue = src/main/tomcatconf/server.xml, property = 
maven.tomcat.exec.war.serverXml )
+@Parameter ( defaultValue = src/main/tomcatconf/server.xml, property = 
maven.tomcat.exec.war.serverXml )
 private File serverXml;
 
 /**
  * Name of the generated exec JAR.
  */
-@Parameter( property = tomcat.jar.finalName,
-defaultValue = 
${project.artifactId}-${project.version}-war-exec.jar, required = true )
+@Parameter ( property = tomcat.jar.finalName,
+ defaultValue = 
${project.artifactId}-${project.version}-war-exec.jar, required = true )
 private String finalName;
 
 /**
  * The webapp context path to use for the web application being run.
  * The name to store webapp in exec jar. Do not use /
  */
-@Parameter( property = maven.tomcat.path, defaultValue = 
${project.artifactId}, required = true )
+@Parameter ( property = maven.tomcat.path, defaultValue = 
${project.artifactId}, required = true )
 protected String path;
 
 @Parameter
@@ -124,13 +125,13 @@ public abstract class AbstractExecWarMoj
 /**
  * Location of the local repository.
  */
-@Parameter( defaultValue = ${localRepository}, required = true, readonly 
= true )
+@Parameter ( defaultValue = ${localRepository}, required = true, 
readonly = true )
 private ArtifactRepository local;
 
 /**
  * List of Remote Repositories used by the resolver
  */
-@Parameter( defaultValue = ${project.remoteArtifactRepositories}, 
required = true, readonly = true )
+@Parameter ( defaultValue = ${project.remoteArtifactRepositories}, 
required = true, readonly = true )
 protected ListArtifactRepository remoteRepos;
 
 @Component
@@ -139,35 +140,35 @@ public abstract class AbstractExecWarMoj
 /**
  * Attach or not the generated artifact to the build (use true if you want 
to install or deploy it)
  */
-@Parameter( property = maven.tomcat.exec.war.attachArtifact, 
defaultValue = true, required = true )
+@Parameter ( property = maven.tomcat.exec.war.attachArtifact, 
defaultValue = true, required = true )
 

svn commit: r1381782 - /tomcat/maven-plugin/trunk/pom.xml

2012-09-06 Thread olamy
Author: olamy
Date: Thu Sep  6 22:18:38 2012
New Revision: 1381782

URL: http://svn.apache.org/viewvc?rev=1381782view=rev
Log:
add contributor

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1381782r1=1381781r2=1381782view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Sep  6 22:18:38 2012
@@ -124,6 +124,9 @@
 contributor
   namePatrick Garcia/name
 /contributor
+contributor
+  nameRobin Bohm/name
+/contributor
   /contributors
 
   licenses



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381783 - /tomcat/maven-plugin/trunk/pom.xml

2012-09-06 Thread olamy
Author: olamy
Date: Thu Sep  6 22:18:45 2012
New Revision: 1381783

URL: http://svn.apache.org/viewvc?rev=1381783view=rev
Log:
use last plexus-utils version 3.0.5

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1381783r1=1381782r2=1381783view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Sep  6 22:18:45 2012
@@ -487,7 +487,7 @@
   dependency
 groupIdorg.codehaus.plexus/groupId
 artifactIdplexus-utils/artifactId
-version3.0.2/version
+version3.0.5/version
   /dependency
   dependency
 groupIdcommons-codec/groupId



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[jira] [Closed] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-06 Thread *$^¨%`£

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-174?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Olivier Lamy (*$^¨%`£) closed MTOMCAT-174.
--

   Resolution: Fixed
Fix Version/s: 2.0

patch applied.
Thanks!

 tomcatConfigurationFilesDirectory is not implemented
 

 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)
 Fix For: 2.0

 Attachments: patch.diff


 Hey Ya :)
 the property tomcatConfigurationFilesDirectory is not implemented yet.
 There is just a field declaration without any handling.
 Ive written a quick patch for my own project that i assign on this issue.
 Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[jira] [Commented] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-06 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/MTOMCAT-174?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13450108#comment-13450108
 ] 

Hudson commented on MTOMCAT-174:


Integrated in TomcatMavenPlugin-mvn3.x #201 (See 
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/201/])
[MTOMCAT-174] tomcatConfigurationFilesDirectory is not implemented

Submitted by Robin Böhm. (Revision 1381781)

 Result = FAILURE
olamy : http://svn.apache.org/viewvc/?view=revrev=1381781
Files : 
* 
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java


 tomcatConfigurationFilesDirectory is not implemented
 

 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)
 Fix For: 2.0

 Attachments: patch.diff


 Hey Ya :)
 the property tomcatConfigurationFilesDirectory is not implemented yet.
 There is just a field declaration without any handling.
 Ive written a quick patch for my own project that i assign on this issue.
 Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org