Modified: jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/changes.xml (original) +++ jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/changes.xml Fri May 4 23:58:06 2007 @@ -1,4 +1,22 @@ <?xml version="1.0"?> +<!-- + 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. +--> <document> <properties> <title>Fulcrum OSWorkflow</title> @@ -12,7 +30,7 @@ </action> <action dev="epugh" type="update"> Changed name of project from workflow to osworkflow to clarify this isn't the - end all and be all workflow tool, but rather just an implementation of the + end all and be all workflow tool, but rather just an implementation of the OpenSymphony version. </action> <action dev="epugh" type="add">
Modified: jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/index.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/index.xml (original) +++ jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/index.xml Fri May 4 23:58:06 2007 @@ -1,4 +1,22 @@ <?xml version="1.0"?> +<!-- + 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. +--> <document> @@ -14,13 +32,13 @@ The OSWorkflow component allows access to a workflow process based on the OpenSymphony OSWorkflow libary. </p> - + <p> It is written for use in any container compatible with Avalon's ECM container. </p> </section> - + <section name="Configuration"> <p> @@ -43,14 +61,14 @@ <source> <![CDATA[ - <workflow> + <workflow> </workflow> ]]> </source> - + </p> </section> - + <section name="Usage"> <p> To use the workflow service, follow the included Example application. Modified: jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/navigation.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/navigation.xml (original) +++ jakarta/turbine/fulcrum/trunk/osworkflow/xdocs/navigation.xml Fri May 4 23:58:06 2007 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + 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. +--> <project name="Workflow" href="http://jakarta.apache.org/turbine/fulcrum/workflow/";> @@ -18,4 +36,4 @@ <item name="Example Application" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-osworkflow-example/index.html"/> </menu> </body> -</project> \ No newline at end of file +</project> Modified: jakarta/turbine/fulcrum/trunk/parser/project.properties URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/project.properties?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/project.properties (original) +++ jakarta/turbine/fulcrum/trunk/parser/project.properties Fri May 4 23:58:06 2007 @@ -1 +1,17 @@ +# 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. Modified: jakarta/turbine/fulcrum/trunk/parser/project.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/project.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/project.xml (original) +++ jakarta/turbine/fulcrum/trunk/parser/project.xml Fri May 4 23:58:06 2007 @@ -1,4 +1,22 @@ <?xml version="1.0"?> +<!-- + 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. +--> <project> <extend>${basedir}/../project.xml</extend> <id>fulcrum-parser</id> @@ -10,7 +28,7 @@ <groupId>fulcrum</groupId> <artifactId>fulcrum-upload</artifactId> <version>1.0.4-dev</version> - </dependency> + </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> @@ -34,42 +52,42 @@ <artifactId>commons-lang</artifactId> <version>2.1</version> <url>http://jakarta.apache.org/commons/lang/index.html</url> - </dependency> + </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> <url>http://jakarta.apache.org/commons/logging/index.html</url> - </dependency> + </dependency> <dependency> <groupId>fulcrum</groupId> <artifactId>fulcrum-pool</artifactId> <version>1.0.3</version> - </dependency> + </dependency> <dependency> <groupId>fulcrum</groupId> <artifactId>fulcrum-factory</artifactId> <version>1.0.3</version> - </dependency> + </dependency> <dependency> <groupId>servletapi</groupId> <artifactId>servletapi</artifactId> <version>2.3</version> <url>http://java.sun.com/products/servlet/</url> </dependency> - + <!-- Needed only for testing --> <dependency> <groupId>fulcrum</groupId> <artifactId>fulcrum-testcontainer</artifactId> <version>1.0.5</version> </dependency> - + <dependency> <groupId>fulcrum</groupId> <artifactId>fulcrum-yaafi</artifactId> <version>1.0.4</version> - </dependency> + </dependency> </dependencies> Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ @@ -73,7 +76,7 @@ */ public class BaseValueParser extends AbstractLogEnabled - implements ValueParser, + implements ValueParser, Recyclable, Configurable { /** The folding from the configuration */ @@ -1539,8 +1542,8 @@ return (key != null) ? (String []) parameters.get(key) : null; } - - + + /** recylable support **/ /** @@ -1621,7 +1624,7 @@ public String convertAndTrim(String value, int fold) { if(value == null) return ""; - + String tmp = value.trim(); switch (fold) @@ -1642,7 +1645,7 @@ tmp = tmp.toUpperCase(); break; } - + default: { getLogger().error("Passed " + fold + " as fold rule, which is illegal!"); @@ -1680,11 +1683,11 @@ if (folding == URL_CASE_FOLDING_UNSET) { String foldString = conf.getChild(URL_CASE_FOLDING_KEY).getValue(URL_CASE_FOLDING_NONE_VALUE).toLowerCase(); - + folding = URL_CASE_FOLDING_NONE; - + getLogger().debug("Setting folding from " + foldString); - + if (StringUtils.isNotEmpty(foldString)) { if (foldString.equals(URL_CASE_FOLDING_NONE_VALUE)) @@ -1706,12 +1709,12 @@ } } } - + parameterEncoding = conf.getChild(PARAMETER_ENCODING_KEY) .getValue(PARAMETER_ENCODING_DEFAULT).toLowerCase(); automaticUpload = conf.getAttributeAsBoolean( - AUTOMATIC_KEY, + AUTOMATIC_KEY, AUTOMATIC_DEFAULT); } } Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CSVParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CSVParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CSVParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CSVParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CookieParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CookieParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CookieParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/CookieParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed 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. + * 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. */ @@ -54,7 +57,7 @@ { /** Avalon Identifier **/ String ROLE = CookieParser.class.getName(); - + static final int AGE_SESSION = -1; static final int AGE_DELETE = 0; @@ -71,7 +74,7 @@ * * @param data the RunData object. */ - void setData (HttpServletRequest request, + void setData (HttpServletRequest request, HttpServletResponse response); /** Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed 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. + * 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. */ @@ -53,7 +56,7 @@ public class DefaultCookieParser extends BaseValueParser implements CookieParser - + { /** * The run data to parse. Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ @@ -73,7 +76,7 @@ * The raw data of a file upload. */ private byte[] uploadData = null; - + /** * The upload service component to use */ @@ -153,9 +156,9 @@ String contentType = request.getHeader("Content-type"); - if (uploadService != null - && getAutomaticUpload() - && contentType != null + if (uploadService != null + && getAutomaticUpload() + && contentType != null && contentType.startsWith("multipart/form-data")) { if (getLogger().isDebugEnabled()) @@ -166,7 +169,7 @@ try { List fileItems = uploadService.parseRequest(request); - + if (fileItems != null) { for (Iterator it = fileItems.iterator(); it.hasNext();) @@ -359,13 +362,13 @@ return null; } } - - // ---------------- Avalon Lifecycle Methods --------------------- + + // ---------------- Avalon Lifecycle Methods --------------------- /** * Avalon component lifecycle method */ public void service(ServiceManager manager) throws ServiceException - { + { if (manager.hasService(UploadService.ROLE)) { uploadService = (UploadService)manager.lookup(UploadService.ROLE); @@ -375,10 +378,10 @@ /* * Automatic parsing of uploaded file items was requested but no * UploadService is available - */ + */ if (getAutomaticUpload()) { - throw new ServiceException(ParameterParser.ROLE, + throw new ServiceException(ParameterParser.ROLE, AUTOMATIC_KEY + " = true requires " + UploadService.ROLE + " to be available"); } Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParameterParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParameterParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParameterParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ParameterParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed 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. + * 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. */ @@ -53,7 +56,7 @@ { /** Avalon Identifier **/ String ROLE = ParameterParser.class.getName(); - + /** * Gets the parsed servlet request. * Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ @@ -40,7 +43,7 @@ * @param urlDecode a <code>boolean</code> value * @exception Exception Error decoding name/value pairs. */ - public void parse(String s, char delim, boolean urlDecode) + public void parse(String s, char delim, boolean urlDecode) throws Exception { String delimChar = String.valueOf(delim); @@ -51,11 +54,11 @@ while (st.hasMoreTokens()) { String tok = st.nextToken(); - if ( urlDecode ) + if ( urlDecode ) { tok = URLDecoder.decode(tok, getCharacterEncoding()); } - + if (isNameTok) { key = tok; @@ -73,15 +76,15 @@ } } - public void parse(String s, char paramDelim, char pairDelim, + public void parse(String s, char paramDelim, char pairDelim, boolean urlDecode) throws Exception { - if ( paramDelim == pairDelim ) + if ( paramDelim == pairDelim ) { parse(s, paramDelim, urlDecode); } - else + else { String delimChar = String.valueOf(paramDelim); StringTokenizer st = new StringTokenizer(s, delimChar); @@ -92,13 +95,13 @@ int pos = pair.indexOf(pairDelim); String name = pair.substring(0, pos); String value = pair.substring(pos+1); - - if ( urlDecode ) + + if ( urlDecode ) { name = URLDecoder.decode(name, getCharacterEncoding()); value = URLDecoder.decode(value, getCharacterEncoding()); } - + if (name.length() > 0) { add (convert(name), value); Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/TSVParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/TSVParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/TSVParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/TSVParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ Modified: jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/ValueParser.java Fri May 4 23:58:06 2007 @@ -2,19 +2,22 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. + * 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 * - * Licensed 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 * - * 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. + * 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. */ @@ -50,7 +53,7 @@ { /** Avalon Identifier **/ String ROLE = ValueParser.class.getName(); - + /** Default Encoding for Parameter Parser */ static final String PARAMETER_ENCODING_DEFAULT = "ISO-8859-1"; @@ -703,7 +706,7 @@ * */ String convertAndTrim(String s); - + /** * A static version of the convert method, which * trims the string data and applies the conversion specified in Modified: jakarta/turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007 @@ -1,3 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <componentConfig> <parser> <parameterEncoding>utf-8</parameterEncoding> @@ -10,4 +29,4 @@ <parameterEncoding>utf-8</parameterEncoding> </base> <upload repository="target" sizeMax="1048576" sizeThreshold="10240"/> -</componentConfig> \ No newline at end of file +</componentConfig> Modified: jakarta/turbine/fulcrum/trunk/parser/src/test/TestRoleConfig.xml URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465 ============================================================================== --- jakarta/turbine/fulcrum/trunk/parser/src/test/TestRoleConfig.xml (original) +++ jakarta/turbine/fulcrum/trunk/parser/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007 @@ -1,10 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <!-- This configuration file for Avalon components is used for testing the TestComponent --> -<role-list> +<role-list> <role name="org.apache.fulcrum.upload.UploadService" shorthand="upload" default-class="org.apache.fulcrum.upload.DefaultUploadService" - /> + /> <role name="org.apache.fulcrum.parser.ParameterParser" shorthand="parser" @@ -20,4 +39,4 @@ shorthand="base" default-class="org.apache.fulcrum.parser.BaseValueParser" /> -</role-list> \ No newline at end of file +</role-list> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
