[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Tutorial-JmsRemoting was last edited by davsclaus (10:20 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Tutorial-JmsRemoting |-- Jetty was last edited by [EMAIL PROTECTED] (01:27 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Jetty |-- How do I retry failed messages forever was created by jstrachan (08:55 AM). | http://cwiki.apache.org/confluence/display/CAMEL/How+do+I+retry+failed+messages+forever |-- EL was last edited by jstrachan (07:25 AM). | http://cwiki.apache.org/confluence/display/CAMEL/EL |-- Artix Data Services was last edited by jstrachan (07:23 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Artix+Data+Services |-- Dead Letter Channel was last edited by davsclaus (07:12 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Dead+Letter+Channel Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- ADS Authentication was created by elecharny (08:58 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/ADS+Authentication Apache JSecurity (JSEC) http://cwiki.apache.org/confluence/display/JSEC | |-Pages Added or Edited in This Space |-- Index was created by adc (12:40 PM). | http://cwiki.apache.org/confluence/display/JSEC/Index Apache ServiceMix Kernel (SMX4KNL) http://cwiki.apache.org/confluence/display/SMX4KNL | |-Pages Added or Edited in This Space |-- 4.6. Provisioning was last edited by ericjohnson (12:40 PM). | http://cwiki.apache.org/confluence/display/SMX4KNL/4.6.+Provisioning |-- Download was last edited by gnodet (05:07 AM). | http://cwiki.apache.org/confluence/display/SMX4KNL/Download |-- ServiceMix Kernel 1.0.0-rc1 was last edited by gnodet (05:07 AM). | http://cwiki.apache.org/confluence/display/SMX4KNL/ServiceMix+Kernel+1.0.0-rc1 Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- dbtester - DB Pool Testing sample application was last edited by djencks (05:02 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/dbtester+-+DB+Pool+Testing+sample+application |-- customer-service Simple ejb application with a JPA entity was created by djencks (04:14 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/customer-service+Simple+ejb+application+with+a+JPA+entity |-- calculator-stateless-pojo - Using EJB 3.0 Functions was last edited by djencks (01:27 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/calculator-stateless-pojo+-+Using+EJB+3.0+Functions |-- Create your own custom server with Geronimo framework was created by [EMAIL PROTECTED] (04:07 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Create+your+own+custom+server+with+Geronimo+framework |-- Tutorials was last edited by [EMAIL PROTECTED] (04:06 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Tutorials |-- Documentation was last edited by [EMAIL PROTECTED] (04:05 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Documentation |-- Convert your current applications into plugins was last edited by [EMAIL PROTECTED] (02:55 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Convert+your+current+applications+into+plugins Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Generic Busy Indicator (for both Ajax and non-Ajax submits) was created by mmakundi (08:58 PM). | http://cwiki.apache.org/confluence/display/WICKET/Generic+Busy+Indicator+%28for+both+Ajax+and+non-Ajax+submits%29 Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- downloads was last edited by [EMAIL PROTECTED] (05:52 AM). | http://cwiki.apache.org/confluence/display/FELIX/downloads |-- news was last edited by [EMAIL PROTECTED] (05:51 AM). | http://cwiki.apache.org/confluence/display/FELIX/news Apache Geronimo Documentation (geronimo) http://cwiki.apache.org/confluence/display/geronimo | |-Pages Added or Edited in This Space |-- Geronimo cwiki documentation architecture was last edited by hcunico (03:39 PM). | http://cwiki.apache.org/confluence/display/geronimo/Geronimo+cwiki+documentation+architecture Apache MINA FtpServer (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Index was last edited by ngn (08:49 AM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Index Apache ActiveMQ (ACTIVEMQ) http://cwiki.apac
svn commit: r666109 - /struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Author: jholmes
Date: Tue Jun 10 06:49:31 2008
New Revision: 666109
URL: http://svn.apache.org/viewvc?rev=666109&view=rev
Log:
Update the generated taglib TLD file XML to conform to the XSD it is supposed
to.
This fixes jira ticket WW-2674.
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java?rev=666109&r1=666108&r2=666109&view=diff
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Tue Jun 10 06:49:31 2008
@@ -118,7 +118,7 @@
// add to map
tags.put(typeName, tag);
}
-
+
//find attributes to be skipped
for (Declaration declaration : skipDeclarations) {
//types will be ignored when hierarchy is scanned
@@ -221,12 +221,12 @@
BeanInfo info = Introspector.getBeanInfo(clazz);
PropertyDescriptor[] props = info.getPropertyDescriptors();
List skipAttributes = tag.getSkipAttributes();
-
+
//iterate over class fields
for(int i = 0; i < props.length; ++i) {
PropertyDescriptor prop = props[i];
Method writeMethod = prop.getWriteMethod();
-
+
//make sure it is public
if(writeMethod != null &&
Modifier.isPublic(writeMethod.getModifiers())) {
//can't use the genertic getAnnotation 'cause the class it
not on this jar
@@ -246,7 +246,7 @@
throw new RuntimeException(e);
}
}
-
+
private Annotation getAnnotation(String typeName, Annotation[]
annotations) {
for(int i = 0; i < annotations.length; i++) {
if(annotations[i].annotationType().getName().equals(typeName))
@@ -325,6 +325,8 @@
tagLib.setAttribute("version", getOption("jspVersion"));
document.appendChild(tagLib);
// tag lib attributes
+appendTextNode(document, tagLib, "description",
+getOption("description"), true);
appendTextNode(document, tagLib, "tlib-version",
getOption("tlibVersion"), false);
appendTextNode(document, tagLib, "short-name",
@@ -332,8 +334,6 @@
appendTextNode(document, tagLib, "uri", getOption("uri"), false);
appendTextNode(document, tagLib, "display-name",
getOption("displayName"), false);
-appendTextNode(document, tagLib, "description",
-getOption("description"), true);
// create tags
for (Map.Entry entry : tags.entrySet()) {
@@ -383,13 +383,13 @@
private void createElement(Document doc, Element tagLibElement, Tag tag) {
Element tagElement = doc.createElement("tag");
tagLibElement.appendChild(tagElement);
+appendTextNode(doc, tagElement, "description", tag.getDescription(),
+true);
appendTextNode(doc, tagElement, "name", tag.getName(), false);
appendTextNode(doc, tagElement, "tag-class", tag.getTldTagClass(),
false);
appendTextNode(doc, tagElement, "body-content",
tag.getTldBodyContent(), false);
-appendTextNode(doc, tagElement, "description", tag.getDescription(),
-true);
// save attributes
for (TagAttribute attribute : tag.getAttributes()) {
@@ -403,14 +403,14 @@
TagAttribute attribute) {
Element attributeElement = doc.createElement("attribute");
tagElement.appendChild(attributeElement);
+appendTextNode(doc, attributeElement, "description", attribute
+.getDescription(), true);
appendTextNode(doc, attributeElement, "name", attribute.getName(),
false);
appendTextNode(doc, attributeElement, "required", String
.valueOf(attribute.isRequired()), false);
appendTextNode(doc, attributeElement, "rtexprvalue", String
.valueOf(attribute.isRtexprvalue()), false);
-appendTextNode(doc, attributeElement, "description", attribute
-.getDescription(), true);
}
private void appendTextNode(Document doc, Element element, String name,
svn commit: r666116 - in /struts/sandbox/trunk/struts2-convention-plugin/src: main/java/org/apache/struts2/convention/ main/java/org/apache/struts2/convention/annotation/ test/java/org/apache/struts2/
Author: musachy
Date: Tue Jun 10 07:07:36 2008
New Revision: 666116
URL: http://svn.apache.org/viewvc?rev=666116&view=rev
Log:
Add @DefaultInterceptorRef to packages
Added:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/annotation/DefaultInterceptorRef.java
(with props)
struts/sandbox/trunk/struts2-convention-plugin/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/
struts/sandbox/trunk/struts2-convention-plugin/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/SingleActionNameAction2.java
struts/sandbox/trunk/struts2-convention-plugin/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/package-info.java
(with props)
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/sandbox/trunk/struts2-convention-plugin/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=666116&r1=666115&r2=666116&view=diff
==
---
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Tue Jun 10 07:07:36 2008
@@ -35,6 +35,7 @@
import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.Actions;
import org.apache.struts2.convention.annotation.AnnotationTools;
+import org.apache.struts2.convention.annotation.DefaultInterceptorRef;
import org.apache.struts2.convention.annotation.ExceptionMapping;
import org.apache.struts2.convention.annotation.ExceptionMappings;
import org.apache.struts2.convention.annotation.Namespace;
@@ -692,6 +693,15 @@
if (pkgConfig == null) {
pkgConfig = new
PackageConfig.Builder(name).namespace(actionNamespace).addParent(parentPkg);
packageConfigs.put(name, pkgConfig);
+
+//check for @DefaultInterceptorRef in the package
+DefaultInterceptorRef defaultInterceptorRef =
AnnotationTools.findAnnotation(actionClass, DefaultInterceptorRef.class);
+if (defaultInterceptorRef != null) {
+pkgConfig.defaultInterceptorRef(defaultInterceptorRef.value());
+
+if (LOG.isTraceEnabled())
+LOG.trace("Setting [#0] as the default interceptor ref for
[#1]", defaultInterceptorRef.value(), pkgConfig.getName());
+}
}
if (LOG.isTraceEnabled()) {
Added:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/annotation/DefaultInterceptorRef.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/annotation/DefaultInterceptorRef.java?rev=666116&view=auto
==
---
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/annotation/DefaultInterceptorRef.java
(added)
+++
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/annotation/DefaultInterceptorRef.java
Tue Jun 10 07:07:36 2008
@@ -0,0 +1,39 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.convention.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Defines the default interceptor for all actions
+ * in this package
+ */
[EMAIL PROTECTED]({ElementType.PACKAGE})
[EMAIL PROTECTED](value = RetentionPolicy.RUNTIME)
+public @interface De
