Author: apaliwal Date: Tue Apr 21 06:56:37 2009 New Revision: 767026 URL: http://svn.apache.org/viewvc?rev=767026&view=rev Log: Updated Header and added Date and Rev as per MINA header Submitted By: Ashish Paliwal (apaliwal.at.apache.org)
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java (contents, props changed) mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java (contents, props changed) Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java?rev=767026&r1=767025&r2=767026&view=diff ============================================================================== --- mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java (original) +++ mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java Tue Apr 21 06:56:37 2009 @@ -1,19 +1,22 @@ -/*********************************************************************** - * Copyright (c) 2006-2007 The Apache Software Foundation. * - * All rights reserved. * - * ------------------------------------------------------------------- * - * 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. + * + */ package org.apache.vysper.spring; import org.apache.vysper.xmpp.cryptography.AbstractTLSContextFactory; @@ -25,6 +28,9 @@ /** * helper factory class to make certificates available to MINA with Spring * resource injection. + * + * @author The Apache MINA Project (d...@mina.apache.org) + * @version $Rev$, $Date$ */ public class ResourceBasedTLSContextFactory extends AbstractTLSContextFactory { Propchange: mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Tue Apr 21 06:56:37 2009 @@ -0,0 +1,134 @@ +### This file configures various client-side behaviors. +### +### The commented-out examples below are intended to demonstrate +### how to use this file. + +### Section for authentication and authorization customizations. +[auth] +### Set store-passwords to 'no' to avoid storing passwords in the +### auth/ area of your config directory. It defaults to 'yes'. +### Note that this option only prevents saving of *new* passwords; +### it doesn't invalidate existing passwords. (To do that, remove +### the cache files by hand as described in the Subversion book.) +# store-passwords = no +### Set store-auth-creds to 'no' to avoid storing any subversion +### credentials in the auth/ area of your config directory. +### It defaults to 'yes'. Note that this option only prevents +### saving of *new* credentials; it doesn't invalidate existing +### caches. (To do that, remove the cache files by hand.) +# store-auth-creds = no + +### Section for configuring external helper applications. +[helpers] +### Set editor to the command used to invoke your text editor. +### This will override the environment variables that Subversion +### examines by default to find this information ($EDITOR, +### et al). +# editor-cmd = editor (vi, emacs, notepad, etc.) +### Set diff-cmd to the absolute path of your 'diff' program. +### This will override the compile-time default, which is to use +### Subversion's internal diff implementation. +# diff-cmd = diff_program (diff, gdiff, etc.) +### Set diff3-cmd to the absolute path of your 'diff3' program. +### This will override the compile-time default, which is to use +### Subversion's internal diff3 implementation. +# diff3-cmd = diff3_program (diff3, gdiff3, etc.) +### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3' +### program accepts the '--diff-program' option. +# diff3-has-program-arg = [true | false] + +### Section for configuring tunnel agents. +[tunnels] +### Configure svn protocol tunnel schemes here. By default, only +### the 'ssh' scheme is defined. You can define other schemes to +### be used with 'svn+scheme://hostname/path' URLs. A scheme +### definition is simply a command, optionally prefixed by an +### environment variable name which can override the command if it +### is defined. The command (or environment variable) may contain +### arguments, using standard shell quoting for arguments with +### spaces. The command will be invoked as: +### <command> <hostname> svnserve -t +### (If the URL includes a username, then the hostname will be +### passed to the tunnel agent as <user>@<hostname>.) If the +### built-in ssh scheme were not predefined, it could be defined +### as: +# ssh = $SVN_SSH ssh +### If you wanted to define a new 'rsh' scheme, to be used with +### 'svn+rsh:' URLs, you could do so as follows: +# rsh = rsh +### Or, if you wanted to specify a full path and arguments: +# rsh = /path/to/rsh -l myusername +### On Windows, if you are specifying a full path to a command, +### use a forward slash (/) or a paired backslash (\\) as the +### path separator. A single backslash will be treated as an +### escape for the following character. + +### Section for configuring miscelleneous Subversion options. +[miscellany] +### Set global-ignores to a set of whitespace-delimited globs +### which Subversion will ignore in its 'status' output, and +### while importing or adding files and directories. +# global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store +### Set log-encoding to the default encoding for log messages +# log-encoding = latin1 +### Set use-commit-times to make checkout/update/switch/revert +### put last-committed timestamps on every file touched. +# use-commit-times = yes +### Set no-unlock to prevent 'svn commit' from automatically +### releasing locks on files. +# no-unlock = yes +### Set enable-auto-props to 'yes' to enable automatic properties +### for 'svn add' and 'svn import', it defaults to 'no'. +### Automatic properties are defined in the section 'auto-props'. +enable-auto-props = yes + +### Section for configuring automatic properties. +[auto-props] +### The format of the entries is: +### file-name-pattern = propname[=value][;propname[=value]...] +### The file-name-pattern can contain wildcards (such as '*' and +### '?'). All entries which match will be applied to the file. +### Note that auto-props functionality must be enabled, which +### is typically done by setting the 'enable-auto-props' option. +# *.c = svn:eol-style=native +# *.cpp = svn:eol-style=native +# *.h = svn:eol-style=native +# *.dsp = svn:eol-style=CRLF +# *.dsw = svn:eol-style=CRLF +# *.sh = svn:eol-style=native;svn:executable +# *.txt = svn:eol-style=native +# *.png = svn:mime-type=image/png +# *.jpg = svn:mime-type=image/jpeg +# Makefile = svn:eol-style=native +*.java = svn:eol-style=native;svn:keywords=Rev Date +*.xml = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.xsl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.xsd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.wsdl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.properties = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Rev Date +*.c = svn:eol-style=native +*.cpp = svn:eol-style=native +*.h = svn:eol-style=native +*.dsp = svn:eol-style=CRLF +*.dsw = svn:eol-style=CRLF +*.sh = svn:eol-style=native;svn:executable +*.bat = svn:eol-style=native +*.pl = svn:eol-style=native +*.py = svn:eol-style=native +*.cmd = svn:eol-style=native +*.txt = svn:eol-style=native;svn:mime-type=text/plain +*.htm* = svn:eol-style=native;svn:mime-type=text/html;svn:keywords=Rev Date +ChangeLog = svn:eol-style=native;svn:mime-type=text/plain +README* = svn:eol-style=native;svn:mime-type=text/plain +LICENSE* = svn:eol-style=native;svn:mime-type=text/plain +NOTICE* = svn:eol-style=native;svn:mime-type=text/plain +TODO* = svn:eol-style=native;svn:mime-type=text/plain +KEYS* = svn:eol-style=native;svn:mime-type=text/plain +INSTALL* = svn:eol-style=native;svn:mime-type=text/plain +WHATSNEW* = svn:eol-style=native;svn:mime-type=text/plain +*.png = svn:mime-type=image/png +*.jpg = svn:mime-type=image/jpeg +*.gif = svn:mime-type=image/gif +Makefile = svn:eol-style=native +*.css = svn:eol-style=native +*.js = svn:eol-style=native Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java?rev=767026&r1=767025&r2=767026&view=diff ============================================================================== --- mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java (original) +++ mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java Tue Apr 21 06:56:37 2009 @@ -1,25 +1,31 @@ -/*********************************************************************** - * Copyright (c) 2006-2007 The Apache Software Foundation. * - * All rights reserved. * - * ------------------------------------------------------------------- * - * 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. + * + */ package org.apache.vysper.spring; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * starts the server as a standalone application using a Spring configuration + * + * @author The Apache MINA Project (d...@mina.apache.org) + * @version $Rev$, $Date$ */ public class ServerMain { @@ -29,9 +35,9 @@ * @param args */ public static void main(String[] args) { - + new ClassPathXmlApplicationContext("spring-config.xml"); - + System.out.println("vysper server is running (using spring framework)..."); } } Propchange: mina/sandbox/vysper/src/main/java/org/apache/vysper/spring/ServerMain.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Tue Apr 21 06:56:37 2009 @@ -0,0 +1,134 @@ +### This file configures various client-side behaviors. +### +### The commented-out examples below are intended to demonstrate +### how to use this file. + +### Section for authentication and authorization customizations. +[auth] +### Set store-passwords to 'no' to avoid storing passwords in the +### auth/ area of your config directory. It defaults to 'yes'. +### Note that this option only prevents saving of *new* passwords; +### it doesn't invalidate existing passwords. (To do that, remove +### the cache files by hand as described in the Subversion book.) +# store-passwords = no +### Set store-auth-creds to 'no' to avoid storing any subversion +### credentials in the auth/ area of your config directory. +### It defaults to 'yes'. Note that this option only prevents +### saving of *new* credentials; it doesn't invalidate existing +### caches. (To do that, remove the cache files by hand.) +# store-auth-creds = no + +### Section for configuring external helper applications. +[helpers] +### Set editor to the command used to invoke your text editor. +### This will override the environment variables that Subversion +### examines by default to find this information ($EDITOR, +### et al). +# editor-cmd = editor (vi, emacs, notepad, etc.) +### Set diff-cmd to the absolute path of your 'diff' program. +### This will override the compile-time default, which is to use +### Subversion's internal diff implementation. +# diff-cmd = diff_program (diff, gdiff, etc.) +### Set diff3-cmd to the absolute path of your 'diff3' program. +### This will override the compile-time default, which is to use +### Subversion's internal diff3 implementation. +# diff3-cmd = diff3_program (diff3, gdiff3, etc.) +### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3' +### program accepts the '--diff-program' option. +# diff3-has-program-arg = [true | false] + +### Section for configuring tunnel agents. +[tunnels] +### Configure svn protocol tunnel schemes here. By default, only +### the 'ssh' scheme is defined. You can define other schemes to +### be used with 'svn+scheme://hostname/path' URLs. A scheme +### definition is simply a command, optionally prefixed by an +### environment variable name which can override the command if it +### is defined. The command (or environment variable) may contain +### arguments, using standard shell quoting for arguments with +### spaces. The command will be invoked as: +### <command> <hostname> svnserve -t +### (If the URL includes a username, then the hostname will be +### passed to the tunnel agent as <user>@<hostname>.) If the +### built-in ssh scheme were not predefined, it could be defined +### as: +# ssh = $SVN_SSH ssh +### If you wanted to define a new 'rsh' scheme, to be used with +### 'svn+rsh:' URLs, you could do so as follows: +# rsh = rsh +### Or, if you wanted to specify a full path and arguments: +# rsh = /path/to/rsh -l myusername +### On Windows, if you are specifying a full path to a command, +### use a forward slash (/) or a paired backslash (\\) as the +### path separator. A single backslash will be treated as an +### escape for the following character. + +### Section for configuring miscelleneous Subversion options. +[miscellany] +### Set global-ignores to a set of whitespace-delimited globs +### which Subversion will ignore in its 'status' output, and +### while importing or adding files and directories. +# global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store +### Set log-encoding to the default encoding for log messages +# log-encoding = latin1 +### Set use-commit-times to make checkout/update/switch/revert +### put last-committed timestamps on every file touched. +# use-commit-times = yes +### Set no-unlock to prevent 'svn commit' from automatically +### releasing locks on files. +# no-unlock = yes +### Set enable-auto-props to 'yes' to enable automatic properties +### for 'svn add' and 'svn import', it defaults to 'no'. +### Automatic properties are defined in the section 'auto-props'. +enable-auto-props = yes + +### Section for configuring automatic properties. +[auto-props] +### The format of the entries is: +### file-name-pattern = propname[=value][;propname[=value]...] +### The file-name-pattern can contain wildcards (such as '*' and +### '?'). All entries which match will be applied to the file. +### Note that auto-props functionality must be enabled, which +### is typically done by setting the 'enable-auto-props' option. +# *.c = svn:eol-style=native +# *.cpp = svn:eol-style=native +# *.h = svn:eol-style=native +# *.dsp = svn:eol-style=CRLF +# *.dsw = svn:eol-style=CRLF +# *.sh = svn:eol-style=native;svn:executable +# *.txt = svn:eol-style=native +# *.png = svn:mime-type=image/png +# *.jpg = svn:mime-type=image/jpeg +# Makefile = svn:eol-style=native +*.java = svn:eol-style=native;svn:keywords=Rev Date +*.xml = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.xsl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.xsd = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.wsdl = svn:mime-type=text/xml;svn:eol-style=native;svn:keywords=Rev Date +*.properties = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Rev Date +*.c = svn:eol-style=native +*.cpp = svn:eol-style=native +*.h = svn:eol-style=native +*.dsp = svn:eol-style=CRLF +*.dsw = svn:eol-style=CRLF +*.sh = svn:eol-style=native;svn:executable +*.bat = svn:eol-style=native +*.pl = svn:eol-style=native +*.py = svn:eol-style=native +*.cmd = svn:eol-style=native +*.txt = svn:eol-style=native;svn:mime-type=text/plain +*.htm* = svn:eol-style=native;svn:mime-type=text/html;svn:keywords=Rev Date +ChangeLog = svn:eol-style=native;svn:mime-type=text/plain +README* = svn:eol-style=native;svn:mime-type=text/plain +LICENSE* = svn:eol-style=native;svn:mime-type=text/plain +NOTICE* = svn:eol-style=native;svn:mime-type=text/plain +TODO* = svn:eol-style=native;svn:mime-type=text/plain +KEYS* = svn:eol-style=native;svn:mime-type=text/plain +INSTALL* = svn:eol-style=native;svn:mime-type=text/plain +WHATSNEW* = svn:eol-style=native;svn:mime-type=text/plain +*.png = svn:mime-type=image/png +*.jpg = svn:mime-type=image/jpeg +*.gif = svn:mime-type=image/gif +Makefile = svn:eol-style=native +*.css = svn:eol-style=native +*.js = svn:eol-style=native