Menu
▾
▴
xoperator-svn — Subversion commit messages
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(32) |
Sep
(7) |
Oct
(3) |
Nov
(27) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(11) |
Feb
(16) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <se...@us...> - 2008-02-21 15:52:43
|
Revision: 121
http://xoperator.svn.sourceforge.net/xoperator/?rev=121&view=rev
Author: seebi
Date: 2008-02-21 07:52:43 -0800 (Thu, 21 Feb 2008)
Log Message:
-----------
[add] 0.1 tag
Added Paths:
-----------
tags/xOperator-0.1/
Copied: tags/xOperator-0.1 (from rev 120, trunk/xOperator)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <se...@us...> - 2008-02-20 17:36:14
|
Revision: 120
http://xoperator.svn.sourceforge.net/xoperator/?rev=120&view=rev
Author: seebi
Date: 2008-02-20 09:36:17 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
build system nice-ups
Modified Paths:
--------------
trunk/xOperator/build.xml
Added Paths:
-----------
trunk/xOperator/scripts/README.txt
trunk/xOperator/scripts/doap.xml
Modified: trunk/xOperator/build.xml
===================================================================
--- trunk/xOperator/build.xml 2008-02-20 17:08:04 UTC (rev 119)
+++ trunk/xOperator/build.xml 2008-02-20 17:36:17 UTC (rev 120)
@@ -23,7 +23,7 @@
</target>
<target name="prepareDist">
- <mkdir dir="dist/lib" />
+ <mkdir dir="dist" />
<echo message="cleaning and preparing the dist directory" />
<delete includeemptydirs="true">
<fileset dir="dist" excludes="*.sh *.bat"/>
@@ -35,6 +35,7 @@
<copy todir="dist">
<fileset dir="scripts" />
</copy>
+ <chmod file="dist/start.sh" perm="ugo+rx"/>
<mkdir dir="dist/doc" />
<copy todir="dist/doc">
<fileset dir="doc" />
Added: trunk/xOperator/scripts/README.txt
===================================================================
--- trunk/xOperator/scripts/README.txt (rev 0)
+++ trunk/xOperator/scripts/README.txt 2008-02-20 17:36:17 UTC (rev 120)
@@ -0,0 +1,19 @@
+== About xOperator ==
+
+Inspired by Tim Berners-Lee's Semantic Agent the xOperator lifts personal
+knowledge exchange to a new level. Imagine sharing exactly the information
+you want with the people you trust. Need a phone number? Want to know the
+birthday of your best friends girlfriend (and in a second step where to buy
+her a present in a store near you)? Do you get tired to tell everybody that
+you have a new cellphone number? xOperator enables users to share all that
+knowledge in a trusted network. Built upon the already existing jabber
+network (secure connections, widely available) an agent running on your pc
+allows other users to query your RDF-database returning the favor to you.
+
+Homepage: http://aksw.org/Projects/xOperator
+ZIP/Tar/BZ2: http://sourceforge.net/project/showfiles.php?group_id=201552
+Changelog: http://aksw.org/Projects/xOperator/ChangeLog
+Source tree: http://xoperator.svn.sourceforge.net/viewvc/xoperator/
+Bug tracker: http://sourceforge.net/tracker/?func=browse&group_id=201552&atid=978019
+Mailing list: http://sourceforge.net/mail/?group_id=201552
+
Added: trunk/xOperator/scripts/doap.xml
===================================================================
--- trunk/xOperator/scripts/doap.xml (rev 0)
+++ trunk/xOperator/scripts/doap.xml 2008-02-20 17:36:17 UTC (rev 120)
@@ -0,0 +1,31 @@
+<Project
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:foaf="http://xmlns.com/foaf/0.1/">
+ <name>xOperator</name>
+ <shortname>xOperator</shortname>
+ <shortdesc>xOperator tries to be a semantic agent for xmpp / jabber network which finds and shares content about resources (using
+RDF/SPARQL) for you and your jabber friends.</shortdesc>
+ <description>Inspired by Tim Berners-Lee's Semantic Agent the xOperator lifts personal knowledge exchange to a new level. Imagine sharing exactly the information you want with the people you trust. Need a phone number? Want to know the birthday of your best friends girlfriend (and in a second step where to buy her a present in a store near you)? Do you get tired to tell everybody that you have a new cellphone number? xOperator enables users to share all that knowledge in a trusted network. Built upon the already existing jabber network (secure connections, widely available) an agent running on your pc allows other users to query your RDF-database returning the favor to you.</description>
+
+ <homepage rdf:resource="http://aksw.org/Projects/xOperator" />
+ <download-page rdf:resource="http://sourceforge.net/project/showfiles.php?group_id=201552" />
+ <bug-database rdf:resource="http://sourceforge.net/tracker/?func=browse&group_id=201552&atid=978019" />
+
+ <programming-language>Java</programming-language>
+ <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
+
+ <maintainer>
+ <foaf:Person>
+ <foaf:name>Sebastian Dietzold</foaf:name>
+ <foaf:homepage rdf:resource="http://sebastian.dietzold.de"/>
+ <rdf:seeAlso rdf:resource="http://sebastian.dietzold.de/rdf/foaf.rdf"/>
+ <foaf:mbox_sha1sum>16ef723e22f2b7c6fc04f151cc7bd400918330b3</foaf:mbox_sha1sum>
+ </foaf:Person>
+ <foaf:Person>
+ <foaf:name>Jörg Unbehauen</foaf:name>
+ </foaf:Person>
+ </maintainer>
+
+</Project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <se...@us...> - 2008-02-20 17:08:32
|
Revision: 119
http://xoperator.svn.sourceforge.net/xoperator/?rev=119&view=rev
Author: seebi
Date: 2008-02-20 09:08:04 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
build system nice-ups
Modified Paths:
--------------
trunk/xOperator/build.xml
Removed Paths:
-------------
trunk/xOperator/dist/
Property Changed:
----------------
trunk/xOperator/
Property changes on: trunk/xOperator
___________________________________________________________________
Name: svn:ignore
+ dist
Modified: trunk/xOperator/build.xml
===================================================================
--- trunk/xOperator/build.xml 2008-02-20 17:02:19 UTC (rev 118)
+++ trunk/xOperator/build.xml 2008-02-20 17:08:04 UTC (rev 119)
@@ -1,31 +1,32 @@
-<?xml version="1.0"?>
-
-<project default="jar" basedir=".">
-
+<?xml version="1.0"?>
+
+<project default="jar" basedir=".">
+
<target name="compile" depends="prepareDist">
- <echo message="compiling" />
- <javac srcdir="src" destdir="bin" debug="on" source="1.5" target="1.5">
- <classpath>
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- </javac>
- <echo message="copying non java classes to into the bin directory"/>
+ <echo message="compiling" />
+ <javac srcdir="src" destdir="bin" debug="on" source="1.5" target="1.5">
+ <classpath>
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ <echo message="copying non java classes to into the bin directory"/>
<copy todir="bin" verbose="true">
<fileset dir="src" excludes="**/*.java **/package.html" />
</copy>
- </target>
+ </target>
<target name="jar" depends="compile">
<echo>Creating jar</echo>
<jar basedir="bin" destfile="dist/agent.jar" manifest="conf/MANIFEST.MF" />
- </target>
+ </target>
<target name="prepareDist">
+ <mkdir dir="dist/lib" />
<echo message="cleaning and preparing the dist directory" />
- <delete includeemptydirs="true">
- <fileset dir="dist" excludes="*.sh *.bat"/>
+ <delete includeemptydirs="true">
+ <fileset dir="dist" excludes="*.sh *.bat"/>
</delete>
<mkdir dir="dist/lib" />
<copy todir="dist/lib">
@@ -33,17 +34,17 @@
</copy>
<copy todir="dist">
<fileset dir="scripts" />
- </copy>
- <mkdir dir="dist/doc" />
- <copy todir="dist/doc">
- <fileset dir="doc" />
</copy>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="doc">
- <packageset dir="src" />
- </javadoc>
- </target>
-
-</project>
+ <mkdir dir="dist/doc" />
+ <copy todir="dist/doc">
+ <fileset dir="doc" />
+ </copy>
+ </target>
+
+ <target name="javadoc">
+ <javadoc destdir="doc">
+ <packageset dir="src" />
+ </javadoc>
+ </target>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <se...@us...> - 2008-02-20 17:02:22
|
Revision: 118
http://xoperator.svn.sourceforge.net/xoperator/?rev=118&view=rev
Author: seebi
Date: 2008-02-20 09:02:19 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
build system nice-ups
Removed Paths:
-------------
trunk/xOperator/scripts/logs/log0.txt
trunk/xOperator/scripts/logs/sequence.txt
trunk/xOperator/scripts/logs/sequence.txt.backup
Property Changed:
----------------
trunk/xOperator/scripts/logs/
Property changes on: trunk/xOperator/scripts/logs
___________________________________________________________________
Name: svn:ignore
+ *
Deleted: trunk/xOperator/scripts/logs/log0.txt
===================================================================
Deleted: trunk/xOperator/scripts/logs/sequence.txt
===================================================================
--- trunk/xOperator/scripts/logs/sequence.txt 2008-02-20 16:59:22 UTC (rev 117)
+++ trunk/xOperator/scripts/logs/sequence.txt 2008-02-20 17:02:19 UTC (rev 118)
@@ -1 +0,0 @@
-1
Deleted: trunk/xOperator/scripts/logs/sequence.txt.backup
===================================================================
--- trunk/xOperator/scripts/logs/sequence.txt.backup 2008-02-20 16:59:22 UTC (rev 117)
+++ trunk/xOperator/scripts/logs/sequence.txt.backup 2008-02-20 17:02:19 UTC (rev 118)
@@ -1 +0,0 @@
-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <se...@us...> - 2008-02-20 16:59:57
|
Revision: 117
http://xoperator.svn.sourceforge.net/xoperator/?rev=117&view=rev
Author: seebi
Date: 2008-02-20 08:59:22 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
build system nice-ups
Modified Paths:
--------------
trunk/xOperator/scripts/start.sh
trunk/xOperator/scripts/xoperator.properties-dist
trunk/xOperator/scripts/xoperator.properties-dist_standalone
Added Paths:
-----------
trunk/xOperator/INSTALL.txt
trunk/xOperator/scripts/LICENSE.txt
Removed Paths:
-------------
trunk/xOperator/scripts/install.svn.txt
trunk/xOperator/scripts/license.txt
trunk/xOperator/scripts/start_google.bat
trunk/xOperator/scripts/start_other.bat
Property Changed:
----------------
trunk/xOperator/.classpath
trunk/xOperator/.project
trunk/xOperator/build.xml
trunk/xOperator/conf/MANIFEST.MF
trunk/xOperator/lib/bsh.jar
trunk/xOperator/lib/chatterbean.jar
trunk/xOperator/lib/commons-cli-1.1.jar
trunk/xOperator/lib/commons-codec-1.3.jar
trunk/xOperator/lib/commons-httpclient-3.0.1.jar
trunk/xOperator/lib/commons-logging-1.1.jar
trunk/xOperator/lib/log4j-1.2.14.jar
trunk/xOperator/lib/picocontainer-1.3.jar
trunk/xOperator/lib/smack.jar
trunk/xOperator/lib/smackx.jar
trunk/xOperator/scripts/start.bat
trunk/xOperator/scripts/start.sh
trunk/xOperator/src/bitoflife/chatterbean/aiml/External.java
trunk/xOperator/src/net/sf/xoperator/agent.properties
trunk/xOperator/src/net/sf/xoperator/configuration/SerializingPersonalDataStore.java
trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLQuery.java
trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLResult.java
trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
trunk/xOperator/src/net/sf/xoperator/store/RDFStoreHTTPAdaptor.java
trunk/xOperator/src/net/sf/xoperator/store/RdfStoreInfo.java
trunk/xOperator/src/net/sf/xoperator/ui/aiml/AliceBotExternal.java
trunk/xOperator/src/net/sf/xoperator/ui/aiml/ExternalListener.java
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/context.xml
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/properties.xml
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/splitters.xml
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/substitutions.xml
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/default.aiml
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/user.aiml
trunk/xOperator/src/net/sf/xoperator/xmpp/AccountInfo.java
trunk/xOperator/src/net/sf/xoperator/xmpp/XmppClient.java
Property changes on: trunk/xOperator/.classpath
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/.project
___________________________________________________________________
Name: svn:executable
- *
Copied: trunk/xOperator/INSTALL.txt (from rev 116, trunk/xOperator/scripts/install.svn.txt)
===================================================================
--- trunk/xOperator/INSTALL.txt (rev 0)
+++ trunk/xOperator/INSTALL.txt 2008-02-20 16:59:22 UTC (rev 117)
@@ -0,0 +1,27 @@
+Please have a look at
+http://aksw.org/Projects/xOperator/InstallFromSubversion
+
+This is a basic install doc :
+
+*************
+1a. Compiling
+- run 'ant' in this directory. after that, the directory 'dist' is created
+
+1b. Compiling with eclipse:
+- load the source into eclipse via svn
+- right click an the ant build.xml file and choose default
+
+*************
+2. Get a second jabber account
+- go to jabber.chaotic.de (example)
+- add a user there
+- add your new jabber account to your old jabber account
+
+*************
+3. Starting the xOperator
+
+Please look at http://aksw.org/Projects/xOperator/FirstSteps
+for First Steps on configuring and using xOperator
+
+- go to folder 'dist'
+- start 'start.bat' or 'start.sh'
Property changes on: trunk/xOperator/build.xml
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/conf/MANIFEST.MF
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/bsh.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/chatterbean.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/commons-cli-1.1.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/commons-httpclient-3.0.1.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/commons-logging-1.1.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/log4j-1.2.14.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/picocontainer-1.3.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/smack.jar
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/xOperator/lib/smackx.jar
___________________________________________________________________
Name: svn:executable
- *
Copied: trunk/xOperator/scripts/LICENSE.txt (from rev 116, trunk/xOperator/scripts/license.txt)
===================================================================
--- trunk/xOperator/scripts/LICENSE.txt (rev 0)
+++ trunk/xOperator/scripts/LICENSE.txt 2008-02-20 16:59:22 UTC (rev 117)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Deleted: trunk/xOperator/scripts/install.svn.txt
===================================================================
--- trunk/xOperator/scripts/install.svn.txt 2008-02-18 16:35:50 UTC (rev 116)
+++ trunk/xOperator/scripts/install.svn.txt 2008-02-20 16:59:22 UTC (rev 117)
@@ -1,23 +0,0 @@
-
-
-This is a basic install script:
-*************
-1. compiling:
--load the source into eclipse via svn
--right click an the ant build.xml file and choose default
-
-*************
-2. get a second jabber account
-- go to jabber.chaotic.de (example)
-- add a user there
-- add your new jabber account to your old jabber account
-
-*************
-3. starting the xOperator
-- go to folder dist
-- use start.bat
-(there are two examples, how it should look like at the end
-start_google.bat is for google accounts
-start_other.bat is for other
-just replace your jabber accoutn and passwords
-)
Deleted: trunk/xOperator/scripts/license.txt
===================================================================
--- trunk/xOperator/scripts/license.txt 2008-02-18 16:35:50 UTC (rev 116)
+++ trunk/xOperator/scripts/license.txt 2008-02-20 16:59:22 UTC (rev 117)
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified...
[truncated message content] |
|
From: <to...@us...> - 2008-02-18 16:35:51
|
Revision: 116
http://xoperator.svn.sourceforge.net/xoperator/?rev=116&view=rev
Author: tomatop
Date: 2008-02-18 08:35:50 -0800 (Mon, 18 Feb 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
Modified: trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-02-18 16:35:20 UTC (rev 115)
+++ trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-02-18 16:35:50 UTC (rev 116)
@@ -191,6 +191,11 @@
System.exit(0);
}
+ createAndRegisterApplication(main, proxy);
+
+ }
+
+ public void createAndRegisterApplication(AccountInfo main, AccountInfo proxy) {
Blackboard bboard = new ThreadsafeObjectBlackboard(
new NoCloningCloneStrategy());
NoPlanBlackBoardControl control = new NoPlanBlackBoardControl(bboard);
@@ -227,9 +232,10 @@
control);
control.registerKnowledgeSource(store);
store.initialize(main, proxy);
-
}
+
+
public static void main(String[] args) {
CommandLineMain main = new CommandLineMain();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-18 16:35:44
|
Revision: 115
http://xoperator.svn.sourceforge.net/xoperator/?rev=115&view=rev
Author: tomatop
Date: 2008-02-18 08:35:20 -0800 (Mon, 18 Feb 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/xOperator/conf/MANIFEST.MF
Modified: trunk/xOperator/conf/MANIFEST.MF
===================================================================
--- trunk/xOperator/conf/MANIFEST.MF 2008-02-12 12:34:47 UTC (rev 114)
+++ trunk/xOperator/conf/MANIFEST.MF 2008-02-18 16:35:20 UTC (rev 115)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.6.5
Created-By: 1.6.0-b105 (Sun Microsystems Inc.)
-Main-Class: net.sf.xoperator.startup.CommandLineMain
+Main-Class: net.sf.xoperator.startup.PropertiesMain
Class-Path: . lib/commons-cli-1.1.jar lib/commons-codec-1.3.jar lib/log4j-1.2.14.jar lib/smackx.jar lib/smack.jar lib/picocontainer-1.3.jar lib/commons-httpclient-3.0.1.jar lib/commons-logging-1.1.jar lib/OpenBBS-0.8.jar lib/chatterbean.jar lib/bsh.jar lib/commons-lang-2.3.jar lib/jdom.jar lib/jaxen-core.jar lib/jaxen-jdom.jar lib/saxpath.jar lib/commons-validator-1.3.1.jar lib/jakarta-oro-2.0.8.jar lib/jaxen-core.jar lib/jaxen-jdom.jar lib/jdom.jar lib/saxpath.jar lib/groovy-all-1.0.jar lib/xpp3-1.1.4c.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2008-02-12 12:34:42
|
Revision: 114
http://xoperator.svn.sourceforge.net/xoperator/?rev=114&view=rev
Author: kurzum
Date: 2008-02-12 04:34:47 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
removed files from ignored folder dist and moved them to scripts, also added property-dist files
Added Paths:
-----------
trunk/xOperator/scripts/xoperator.properties-dist
trunk/xOperator/scripts/xoperator.properties-dist_standalone
Removed Paths:
-------------
trunk/xOperator/dist/start.bat
trunk/xOperator/dist/start.sh
trunk/xOperator/dist/xoperator.properties-dist
Deleted: trunk/xOperator/dist/start.bat
===================================================================
--- trunk/xOperator/dist/start.bat 2008-02-12 12:32:01 UTC (rev 113)
+++ trunk/xOperator/dist/start.bat 2008-02-12 12:34:47 UTC (rev 114)
@@ -1,4 +0,0 @@
-@REM for a xoperator.properties at a different location,
-@REM simply add the path to the file as a single parameter,
-@REM e.g.: java -jar agent.jar ../stuff/xoperator.properties
-java -jar agent.jar
\ No newline at end of file
Deleted: trunk/xOperator/dist/start.sh
===================================================================
--- trunk/xOperator/dist/start.sh 2008-02-12 12:32:01 UTC (rev 113)
+++ trunk/xOperator/dist/start.sh 2008-02-12 12:34:47 UTC (rev 114)
@@ -1,4 +0,0 @@
-# for a xoperator.properties at a different location,
-# simply add the path to the file as a single parameter,
-# e.g.: java -jar agent.jar ../stuff/xoperator.properties
-java -jar agent.jar
Deleted: trunk/xOperator/dist/xoperator.properties-dist
===================================================================
--- trunk/xOperator/dist/xoperator.properties-dist 2008-02-12 12:32:01 UTC (rev 113)
+++ trunk/xOperator/dist/xoperator.properties-dist 2008-02-12 12:34:47 UTC (rev 114)
@@ -1,35 +0,0 @@
-#In this file the initial configuraiton of the xOperator is defined.
-#The default behavior is to load the properties from the xoperator.properties file.
-#By giving an additional parameter to the program an other file can be selected, see
-#the accompanying scripts.
-
-#At least one jabber account is necessary for the xOperator to run.
-#When using it as a personal agent and you dont't want to share
-#it, the propxy account info is also needed.
-
-#the full jid, e.g. som...@so...
-main_username=xxxx
-
-#the password for this account
-main_password=yyyy
-
-#server has only to be defined, when it is different from the domain part of the jid,
-#which is the case for example for gmail
-#main_server=
-
-#has only to be set if different from thestandard port.
-#main_port=
-
-#if set to true, no proxy account is necessary and the main account is
-#used for interaction
-standanlone=false
-
-#enable inter-agent communication, not working properly at this moment.
-p2penabled=false
-
-
-#comment the following lines out, in case you want to have
-proxy_username=xxxx
-proxy_password=yyyy
-#proxy_server=
-#proxy_port=
\ No newline at end of file
Copied: trunk/xOperator/scripts/xoperator.properties-dist (from rev 113, trunk/xOperator/dist/xoperator.properties-dist)
===================================================================
--- trunk/xOperator/scripts/xoperator.properties-dist (rev 0)
+++ trunk/xOperator/scripts/xoperator.properties-dist 2008-02-12 12:34:47 UTC (rev 114)
@@ -0,0 +1,46 @@
+##xOperator property file
+##the standard name for this file should be
+##'xoperator.properties'
+##rename the file to make it work
+
+##In this file the initial configuraiton of the xOperator is defined.
+##The default behavior is to load the properties from the xoperator.properties file.
+##By giving an additional parameter to the program another file can be selected, see
+##the accompanying scripts.
+
+##At least one jabber account is necessary for the xOperator to run.
+##When using it as a personal agent and you dont't want to share
+##it, the proxy account info is also needed.
+##the main jabber account is your normal jabber account
+##the proxy jabber account is the separate account for yout xOperator
+
+#***MAIN************
+##your full jid, e.g. som...@so...
+main_username=xxxx
+
+##the password for this account
+main_password=yyyy
+
+##server has only to be defined, when it is different from the domain part of the jid,
+##which is the case for example for gmail
+#main_server=talk.google.com
+
+
+##has only to be set if different from thestandard port.
+#main_port=
+
+#***PROXY************
+##if set to true, no proxy account is necessary and the main account is
+##used for interaction
+standalone=false
+
+##enable inter-agent communication, not working properly at this moment.
+p2penabled=false
+
+
+##outcomment the following lines, in case you want to have
+##a proxy and put standalone above on false
+proxy_username=xxxx
+proxy_password=yyyy
+#proxy_server=
+#proxy_port=
\ No newline at end of file
Added: trunk/xOperator/scripts/xoperator.properties-dist_standalone
===================================================================
--- trunk/xOperator/scripts/xoperator.properties-dist_standalone (rev 0)
+++ trunk/xOperator/scripts/xoperator.properties-dist_standalone 2008-02-12 12:34:47 UTC (rev 114)
@@ -0,0 +1,46 @@
+##xOperator property file
+##the standard name for this file should be
+##'xoperator.properties'
+##rename the file to make it work
+
+##In this file the initial configuraiton of the xOperator is defined.
+##The default behavior is to load the properties from the xoperator.properties file.
+##By giving an additional parameter to the program another file can be selected, see
+##the accompanying scripts.
+
+##At least one jabber account is necessary for the xOperator to run.
+##When using it as a personal agent and you dont't want to share
+##it, the proxy account info is also needed.
+##the main jabber account is your normal jabber account
+##the proxy jabber account is the separate account for yout xOperator
+
+#***MAIN************
+##your full jid, e.g. som...@so...
+main_username=xxxx
+
+##the password for this account
+main_password=yyyy
+
+##server has only to be defined, when it is different from the domain part of the jid,
+##which is the case for example for gmail
+#main_server=talk.google.com
+
+
+##has only to be set if different from thestandard port.
+#main_port=
+
+#***PROXY************
+##if set to true, no proxy account is necessary and the main account is
+##used for interaction
+standalone=true
+
+##enable inter-agent communication, not working properly at this moment.
+p2penabled=false
+
+
+##outcomment the following lines, in case you want to have
+##a proxy and put standalone above on false
+#proxy_username=
+#proxy_password=
+#proxy_server=
+#proxy_port=
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2008-02-12 12:31:58
|
Revision: 113
http://xoperator.svn.sourceforge.net/xoperator/?rev=113&view=rev
Author: kurzum
Date: 2008-02-12 04:32:01 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
changed filename
Modified Paths:
--------------
trunk/xOperator/dist/start.bat
Added Paths:
-----------
trunk/xOperator/dist/xoperator.properties-dist
Removed Paths:
-------------
trunk/xOperator/dist/xoperator.properties
Modified: trunk/xOperator/dist/start.bat
===================================================================
--- trunk/xOperator/dist/start.bat 2008-02-12 12:25:10 UTC (rev 112)
+++ trunk/xOperator/dist/start.bat 2008-02-12 12:32:01 UTC (rev 113)
@@ -1,4 +1,4 @@
-rem for a xoperator.properties at a different location,
-rem simply add the path to the file as a single parameter,
-rem e.g.: java -jar agent.jar ../stuff/xoperator.properties
+@REM for a xoperator.properties at a different location,
+@REM simply add the path to the file as a single parameter,
+@REM e.g.: java -jar agent.jar ../stuff/xoperator.properties
java -jar agent.jar
\ No newline at end of file
Deleted: trunk/xOperator/dist/xoperator.properties
===================================================================
--- trunk/xOperator/dist/xoperator.properties 2008-02-12 12:25:10 UTC (rev 112)
+++ trunk/xOperator/dist/xoperator.properties 2008-02-12 12:32:01 UTC (rev 113)
@@ -1,35 +0,0 @@
-#In this file the initial configuraiton of the xOperator is defined.
-#The default behavior is to load the properties from the xoperator.properties file.
-#By giving an additional parameter to the program an other file can be selected, see
-#the accompanying scripts.
-
-#At least one jabber account is necessary for the xOperator to run.
-#When using it as a personal agent and you dont't want to share
-#it, the propxy account info is also needed.
-
-#the full jid, e.g. som...@so...
-main_username=xxxx
-
-#the password for this account
-main_password=yyyy
-
-#server has only to be defined, when it is different from the domain part of the jid,
-#which is the case for example for gmail
-#main_server=
-
-#has only to be set if different from thestandard port.
-#main_port=
-
-#if set to true, no proxy account is necessary and the main account is
-#used for interaction
-standanlone=false
-
-#enable inter-agent communication, not working properly at this moment.
-p2penabled=false
-
-
-#comment the following lines out, in case you want to have
-proxy_username=xxxx
-proxy_password=yyyy
-#proxy_server=
-#proxy_port=
\ No newline at end of file
Copied: trunk/xOperator/dist/xoperator.properties-dist (from rev 112, trunk/xOperator/dist/xoperator.properties)
===================================================================
--- trunk/xOperator/dist/xoperator.properties-dist (rev 0)
+++ trunk/xOperator/dist/xoperator.properties-dist 2008-02-12 12:32:01 UTC (rev 113)
@@ -0,0 +1,35 @@
+#In this file the initial configuraiton of the xOperator is defined.
+#The default behavior is to load the properties from the xoperator.properties file.
+#By giving an additional parameter to the program an other file can be selected, see
+#the accompanying scripts.
+
+#At least one jabber account is necessary for the xOperator to run.
+#When using it as a personal agent and you dont't want to share
+#it, the propxy account info is also needed.
+
+#the full jid, e.g. som...@so...
+main_username=xxxx
+
+#the password for this account
+main_password=yyyy
+
+#server has only to be defined, when it is different from the domain part of the jid,
+#which is the case for example for gmail
+#main_server=
+
+#has only to be set if different from thestandard port.
+#main_port=
+
+#if set to true, no proxy account is necessary and the main account is
+#used for interaction
+standanlone=false
+
+#enable inter-agent communication, not working properly at this moment.
+p2penabled=false
+
+
+#comment the following lines out, in case you want to have
+proxy_username=xxxx
+proxy_password=yyyy
+#proxy_server=
+#proxy_port=
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ku...@us...> - 2008-02-12 12:25:06
|
Revision: 112
http://xoperator.svn.sourceforge.net/xoperator/?rev=112&view=rev
Author: kurzum
Date: 2008-02-12 04:25:10 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
new start.bat and installation
Modified Paths:
--------------
trunk/xOperator/scripts/start.bat
Added Paths:
-----------
trunk/xOperator/scripts/install.svn.txt
trunk/xOperator/scripts/start.sh
Removed Paths:
-------------
trunk/xOperator/scripts/install.txt
Copied: trunk/xOperator/scripts/install.svn.txt (from rev 111, trunk/xOperator/scripts/install.txt)
===================================================================
--- trunk/xOperator/scripts/install.svn.txt (rev 0)
+++ trunk/xOperator/scripts/install.svn.txt 2008-02-12 12:25:10 UTC (rev 112)
@@ -0,0 +1,23 @@
+
+
+This is a basic install script:
+*************
+1. compiling:
+-load the source into eclipse via svn
+-right click an the ant build.xml file and choose default
+
+*************
+2. get a second jabber account
+- go to jabber.chaotic.de (example)
+- add a user there
+- add your new jabber account to your old jabber account
+
+*************
+3. starting the xOperator
+- go to folder dist
+- use start.bat
+(there are two examples, how it should look like at the end
+start_google.bat is for google accounts
+start_other.bat is for other
+just replace your jabber accoutn and passwords
+)
Deleted: trunk/xOperator/scripts/install.txt
===================================================================
--- trunk/xOperator/scripts/install.txt 2008-02-08 04:57:05 UTC (rev 111)
+++ trunk/xOperator/scripts/install.txt 2008-02-12 12:25:10 UTC (rev 112)
@@ -1,23 +0,0 @@
-
-
-This is a basic install script:
-*************
-1. compiling:
--load the source into eclipse via svn
--right click an the ant build.xml file and choose default
-
-*************
-2. get a second jabber account
-- go to jabber.chaotic.de (example)
-- add a user there
-- add your new jabber account to your old jabber account
-
-*************
-3. starting the xOperator
-- go to folder dist
-- use start.bat
-(there are two examples, how it should look like at the end
-start_google.bat is for google accounts
-start_other.bat is for other
-just replace your jabber accoutn and passwords
-)
Modified: trunk/xOperator/scripts/start.bat
===================================================================
--- trunk/xOperator/scripts/start.bat 2008-02-08 04:57:05 UTC (rev 111)
+++ trunk/xOperator/scripts/start.bat 2008-02-12 12:25:10 UTC (rev 112)
@@ -1 +1,4 @@
+@REM for a xoperator.properties at a different location,
+@REM simply add the path to the file as a single parameter,
+@REM e.g.: java -jar agent.jar ../stuff/xoperator.properties
java -jar agent.jar
\ No newline at end of file
Added: trunk/xOperator/scripts/start.sh
===================================================================
--- trunk/xOperator/scripts/start.sh (rev 0)
+++ trunk/xOperator/scripts/start.sh 2008-02-12 12:25:10 UTC (rev 112)
@@ -0,0 +1,4 @@
+# for a xoperator.properties at a different location,
+# simply add the path to the file as a single parameter,
+# e.g.: java -jar agent.jar ../stuff/xoperator.properties
+java -jar agent.jar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-08 04:57:48
|
Revision: 111
http://xoperator.svn.sourceforge.net/xoperator/?rev=111&view=rev
Author: tomatop
Date: 2008-02-07 20:57:05 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
even better now!!
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java
Modified: trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java 2008-02-08 04:43:37 UTC (rev 110)
+++ trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java 2008-02-08 04:57:05 UTC (rev 111)
@@ -89,6 +89,7 @@
main.setPassword(props.getProperty("main_password"));
main.setServer(props.getProperty("main_server"));
main.setPort(props.getProperty("main_port")!=null?Integer.parseInt(props.getProperty("main_port")):Constants.DEFAULT_JABBER_PORT);
+ main.setStandalone(Boolean.parseBoolean(props.getProperty("standalone")));
return main;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-08 04:43:31
|
Revision: 110
http://xoperator.svn.sourceforge.net/xoperator/?rev=110&view=rev
Author: tomatop
Date: 2008-02-07 20:43:37 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
start scripts, now without parameters
Added Paths:
-----------
trunk/xOperator/dist/start.bat
trunk/xOperator/dist/start.sh
Added: trunk/xOperator/dist/start.bat
===================================================================
--- trunk/xOperator/dist/start.bat (rev 0)
+++ trunk/xOperator/dist/start.bat 2008-02-08 04:43:37 UTC (rev 110)
@@ -0,0 +1,4 @@
+rem for a xoperator.properties at a different location,
+rem simply add the path to the file as a single parameter,
+rem e.g.: java -jar agent.jar ../stuff/xoperator.properties
+java -jar agent.jar
\ No newline at end of file
Added: trunk/xOperator/dist/start.sh
===================================================================
--- trunk/xOperator/dist/start.sh (rev 0)
+++ trunk/xOperator/dist/start.sh 2008-02-08 04:43:37 UTC (rev 110)
@@ -0,0 +1,4 @@
+# for a xoperator.properties at a different location,
+# simply add the path to the file as a single parameter,
+# e.g.: java -jar agent.jar ../stuff/xoperator.properties
+java -jar agent.jar
Property changes on: trunk/xOperator/dist/start.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-08 04:30:12
|
Revision: 109
http://xoperator.svn.sourceforge.net/xoperator/?rev=109&view=rev
Author: tomatop
Date: 2008-02-07 20:30:11 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
feature [1886877], parameters now in properties
Added Paths:
-----------
trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java
Added: trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/startup/PropertiesMain.java 2008-02-08 04:30:11 UTC (rev 109)
@@ -0,0 +1,96 @@
+package net.sf.xoperator.startup;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import net.sf.xoperator.Constants;
+import net.sf.xoperator.xmpp.AccountInfo;
+
+public class PropertiesMain extends CommandLineMain {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+ PropertiesMain main = new PropertiesMain();
+
+ main.startUp(args);
+ int exit = 0;
+ try {
+ while (exit!=-1) {
+ exit = System.in.read();
+ }
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ public void startUp(String[] args) {
+ Properties props = new Properties();
+ if(args.length==0){
+ //use the xoperator.properties file
+ try {
+ props.load(new FileInputStream("xoperator.properties"));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ }else if(args.length==1){
+ //use the user defined properties file
+ try{
+ props.load(new FileInputStream(args[0]));
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ }else{
+ System.out.println("Invalid properties count, please recheck parameters.");
+ System.exit(1);
+ }
+ // we assume main is always there
+ AccountInfo main = createMainAccount(props);
+
+ // if not standalone, there has to be an proxy account
+
+ AccountInfo proxy =null;
+ if(!Boolean.parseBoolean(props.getProperty("standalone"))){
+ proxy = createProxyAccount(props);
+ }
+
+
+
+ createAndRegisterApplication(main, proxy);
+
+
+
+
+ }
+
+ private AccountInfo createProxyAccount(Properties props) {
+ AccountInfo proxy = new AccountInfo();
+ proxy.setMainAccount(false);
+ proxy.setUsername(props.getProperty("proxy_username"));
+ proxy.setPassword(props.getProperty("proxy_password"));
+ proxy.setServer(props.getProperty("proxy_server"));
+ proxy.setPort(props.getProperty("proxy_port")!=null?Integer.parseInt(props.getProperty("proxy_port")):Constants.DEFAULT_JABBER_PORT);
+ return proxy;
+ }
+
+ private AccountInfo createMainAccount(Properties props) {
+ AccountInfo main = new AccountInfo();
+ main.setMainAccount(true);
+ main.setUsername(props.getProperty("main_username"));
+ main.setPassword(props.getProperty("main_password"));
+ main.setServer(props.getProperty("main_server"));
+ main.setPort(props.getProperty("main_port")!=null?Integer.parseInt(props.getProperty("main_port")):Constants.DEFAULT_JABBER_PORT);
+ return main;
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-08 04:27:10
|
Revision: 108
http://xoperator.svn.sourceforge.net/xoperator/?rev=108&view=rev
Author: tomatop
Date: 2008-02-07 20:27:07 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
logindata now in properties
Added Paths:
-----------
trunk/xOperator/dist/xoperator.properties
Added: trunk/xOperator/dist/xoperator.properties
===================================================================
--- trunk/xOperator/dist/xoperator.properties (rev 0)
+++ trunk/xOperator/dist/xoperator.properties 2008-02-08 04:27:07 UTC (rev 108)
@@ -0,0 +1,35 @@
+#In this file the initial configuraiton of the xOperator is defined.
+#The default behavior is to load the properties from the xoperator.properties file.
+#By giving an additional parameter to the program an other file can be selected, see
+#the accompanying scripts.
+
+#At least one jabber account is necessary for the xOperator to run.
+#When using it as a personal agent and you dont't want to share
+#it, the propxy account info is also needed.
+
+#the full jid, e.g. som...@so...
+main_username=xxxx
+
+#the password for this account
+main_password=yyyy
+
+#server has only to be defined, when it is different from the domain part of the jid,
+#which is the case for example for gmail
+#main_server=
+
+#has only to be set if different from thestandard port.
+#main_port=
+
+#if set to true, no proxy account is necessary and the main account is
+#used for interaction
+standanlone=false
+
+#enable inter-agent communication, not working properly at this moment.
+p2penabled=false
+
+
+#comment the following lines out, in case you want to have
+proxy_username=xxxx
+proxy_password=yyyy
+#proxy_server=
+#proxy_port=
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-07 04:02:00
|
Revision: 107
http://xoperator.svn.sourceforge.net/xoperator/?rev=107&view=rev
Author: tomatop
Date: 2008-02-06 20:02:02 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
small fix: the xoperator reacts again in standalone
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-02-05 04:16:19 UTC (rev 106)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-02-07 04:02:02 UTC (rev 107)
@@ -95,6 +95,9 @@
if (info.isP2penabled()) {
registerInterAgentCommunicationListener(mainClient);
}
+ if(info.isStandalone()){
+ registerChatListeners(mainClient);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-02-05 04:16:16
|
Revision: 106
http://xoperator.svn.sourceforge.net/xoperator/?rev=106&view=rev
Author: tomatop
Date: 2008-02-04 20:16:19 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
fix auth mechanism
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
trunk/xOperator/src/net/sf/xoperator/xmpp/XmppClient.java
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-01-18 22:27:33 UTC (rev 105)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-02-05 04:16:19 UTC (rev 106)
@@ -18,6 +18,7 @@
import org.jivesoftware.smack.Chat;
import org.jivesoftware.smack.ChatManagerListener;
import org.jivesoftware.smack.MessageListener;
+import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Message;
import org.openbbs.blackboard.filter.KindOfFilter;
@@ -31,7 +32,7 @@
*
*/
public class XMPPManager extends ConfigurationAwareKnowledgeSource {
-
+
private SPARQLResult.IQPacketListener mainClientResultListener;
private Log log = LogFactory.getLog(XMPPManager.class);
@@ -58,8 +59,27 @@
logIntoProxy(info);
}
+ // makes sure the proxy and the main account know each other
+
+ if (mainClient != null && proxyClient != null) {
+ // check if main knows proxy
+ introduce(mainClient, proxyClient);
+
+
+ }
+
}
+ /**
+ * introduces client1 to client2
+ *
+ * @return true if previusly unknown
+ */
+ private void introduce(XmppClient client1, XmppClient client2) {
+ client1.allowRosterAccess(client2.accountInfo.getUsername(), "My Agent");
+ client2.allowRosterAccess(client1.accountInfo.getUsername(), "My Master");
+ }
+
private void logIntoMain(AccountInfo info) {
if (this.mainClient != null) {
this.mainClient.logoff();
@@ -71,14 +91,11 @@
this.log.error(e);
throw new RuntimeException(e);
}
- if(info.isStandalone()){
- registerChatListeners(mainClient);
- }
-
- if(info.isP2penabled()){
+
+ if (info.isP2penabled()) {
registerInterAgentCommunicationListener(mainClient);
}
-
+
}
private void logIntoProxy(AccountInfo info) {
@@ -90,10 +107,8 @@
try {
this.proxyClient.login();
} catch (XMPPException e) {
- this.log
- .info(
- "No valid inforamtion to log into proxy account, trying to create one",
- e);
+ this.log.info("No valid inforamtion "
+ + "to log into proxy account, trying to create one", e);
try {
this.proxyClient
.createAccount(this.mainClient.getAccountInfo());
@@ -117,7 +132,7 @@
sendPendingMessagesToUser(context);
- //forwardQueriesAndResults(context);
+ // forwardQueriesAndResults(context);
}
@@ -152,10 +167,11 @@
query.setTo(jid);
mainClient.sendQuery(query);
mainClientResultListener.registerQuery(query, context);
-
+
}
query.setHtl(0);
- context.blackboard().write(new StringMessage("Passed the query to stores: ")+agents);
+ context.blackboard().write(
+ new StringMessage("Passed the query to stores: ") + agents);
}
if (query != null && query.getOutputType().equals(SPARQLQuery.P2P)) {
@@ -176,14 +192,8 @@
new KindOfFilter(Chat.class));
if (chat != null) {
- Set mess = context.blackboard().readAll(
+ Set messages = context.blackboard().readAll(
new KindOfFilter(MessageToUser.class));
- List messages = new ArrayList<MessageToUser>();
-
- for (Object object : mess) {
- messages.add(object);
- }
-
Set sendMsgNote = context.blackboard().readAll(
new KindOfFilter(MessageSend.class));
if (messages.size() > sendMsgNote.size()) {
@@ -249,7 +259,9 @@
private void registerInterAgentCommunicationListener(XmppClient client) {
this.mainClientResultListener = new SPARQLResult.IQPacketListener();
- client.setSPARQLEnabled(true, new SPARQLQuery.IQPaketListener(control), new SPARQLQuery.IQPacketFilter(), mainClientResultListener, new SPARQLResult.IQPacketFilter());
+ client.setSPARQLEnabled(true, new SPARQLQuery.IQPaketListener(control),
+ new SPARQLQuery.IQPacketFilter(), mainClientResultListener,
+ new SPARQLResult.IQPacketFilter());
}
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/XmppClient.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/XmppClient.java 2008-01-18 22:27:33 UTC (rev 105)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/XmppClient.java 2008-02-05 04:16:19 UTC (rev 106)
@@ -45,6 +45,7 @@
Constants.SPARQL_XMPP_SPEC_URL, new SPARQLQuery.Provider());
ProviderManager.getInstance().addIQProvider("sparql-result",
Constants.SPARQL_XMPP_SPEC_URL, new SPARQLResult.Provider());
+ Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.manual);
}
private XMPPConnection conn = null;
@@ -55,20 +56,14 @@
private AgentListener rosterListener;
+
+
AccountInfo accountInfo;
private static final Logger log = Logger.getLogger(XmppClient.class);
- public XmppClient(String username, String password, String server,
- String resource, int port) {
- super();
- this.accountInfo = new AccountInfo();
- this.accountInfo.setUsername(username);
- this.accountInfo.setPassword(password);
- this.accountInfo.setServer(server);
- this.accountInfo.setResource(resource);
- }
+
public XmppClient(AccountInfo info) {
this.accountInfo = info;
}
@@ -97,9 +92,23 @@
}
});
}
+ synchronized (this) {
+ if(this.accountInfo.isStandalone()){
+ Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.accept_all);
+ }
+ this.conn.login(this.accountInfo.getUsername().split("@")[0],
+ this.accountInfo.getPassword(), this.accountInfo.getResource());
+
+ if(this.accountInfo.isStandalone()){
+ Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.manual);
+ }
+
+ }
- this.conn.login(this.accountInfo.getUsername().split("@")[0],
- this.accountInfo.getPassword(), this.accountInfo.getResource());
+
+
+
+
this.sdisc = ServiceDiscoveryManager.getInstanceFor(this.conn);
return this;
@@ -339,5 +348,22 @@
}
}
+
+
+ public void allowRosterAccess(String jid, String nick){
+ try {
+ if(!getRoster().contains(jid)){
+ getRoster().createEntry(jid, nick, null);
+ }
+ Presence pres = new Presence(Presence.Type.subscribed);
+ pres.setTo(jid);
+ conn.sendPacket(pres);
+ } catch (XMPPException e) {
+ log.error("Error adding to Roster: " ,e);
+ }
+
+ }
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-18 22:27:28
|
Revision: 105
http://xoperator.svn.sourceforge.net/xoperator/?rev=105&view=rev
Author: tomatop
Date: 2008-01-18 14:27:33 -0800 (Fri, 18 Jan 2008)
Log Message:
-----------
copying of all the groovy files
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
Modified: trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-18 22:19:41 UTC (rev 104)
+++ trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-18 22:27:33 UTC (rev 105)
@@ -65,7 +65,13 @@
private static final String CONF_FOLDER_IN_CLASSPATH = "net/sf/xoperator/ui/aiml/conf/";
private static final String GROOVY_SAMPLE = "sample.groovy";
+ private static final String FOAF_GROUP_ATT_SAMPLE = "foafGroupAttributes.groovy";
+ private static final String FOAF_GROUP_MEM_SAMPLE = "foafGroupMember.groovy";
+ private static final String FOAF_PERSON_ATT_SAMPLE = "foafPersonAttributes.groovy";
+ private static final String ICAL_SAMPLE = "iCalWhereNow.groovy";
+ private static final String TELL_ME_MORE_SAMPLE = "tellMeMoreAbout.groovy";
+
private Log log = LogFactory.getLog(SerialisingPersister.class);
public SerialisingPersister(String username) {
@@ -162,6 +168,21 @@
createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ GROOVY_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ TEMPLATE_FOLDER + "/" + GROOVY_SAMPLE);
+ createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ + FOAF_GROUP_ATT_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ + TEMPLATE_FOLDER + "/" + FOAF_GROUP_ATT_SAMPLE);
+ createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ + FOAF_GROUP_MEM_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ + TEMPLATE_FOLDER + "/" + FOAF_GROUP_MEM_SAMPLE);
+ createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ + FOAF_PERSON_ATT_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ + TEMPLATE_FOLDER + "/" + FOAF_PERSON_ATT_SAMPLE);
+ createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ + ICAL_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ + TEMPLATE_FOLDER + "/" + ICAL_SAMPLE);
+ createFile(templateFolder.getAbsolutePath() + FILE_SEPARATOR
+ + TELL_ME_MORE_SAMPLE, CONF_FOLDER_IN_CLASSPATH
+ + TEMPLATE_FOLDER + "/" + TELL_ME_MORE_SAMPLE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-18 22:19:38
|
Revision: 104
http://xoperator.svn.sourceforge.net/xoperator/?rev=104&view=rev
Author: tomatop
Date: 2008-01-18 14:19:41 -0800 (Fri, 18 Jan 2008)
Log Message:
-----------
stripping of html data
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/store/RDFStoreHTTPAdaptor.java
Modified: trunk/xOperator/src/net/sf/xoperator/store/RDFStoreHTTPAdaptor.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/store/RDFStoreHTTPAdaptor.java 2008-01-17 21:03:32 UTC (rev 103)
+++ trunk/xOperator/src/net/sf/xoperator/store/RDFStoreHTTPAdaptor.java 2008-01-18 22:19:41 UTC (rev 104)
@@ -25,6 +25,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import net.sf.xoperator.blackboard.ConfigurationAwareKnowledgeSource;
import net.sf.xoperator.configuration.KSConfiguration;
@@ -82,8 +84,15 @@
if (get.getStatusCode() == 200) {
return new SPARQLResult(res, info.getName());
} else {
+
+ //strip html from res
+
+
+ Pattern pat = Pattern.compile("(<\\!--.*?-->)|(<\\!.*?>)|(<.+?>)",Pattern.DOTALL);
+ String stripRes = pat.matcher(res).replaceAll("").replaceAll("\\s+", " ");
+
return new StringMessage("Store " + info.getName()
- + " was unable to execute the query: " + res);
+ + " was unable to execute the query: " + stripRes);
}
} catch (UnsupportedEncodingException e1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-17 21:03:27
|
Revision: 103
http://xoperator.svn.sourceforge.net/xoperator/?rev=103&view=rev
Author: tomatop
Date: 2008-01-17 13:03:32 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/blackboard/NoPlanBlackBoardControl.java
trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeTransientMemory.java
trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLQuery.java
trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
trunk/xOperator/src/net/sf/xoperator/ui/aiml/TemplateExectutionContext.java
trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
Modified: trunk/xOperator/src/net/sf/xoperator/blackboard/NoPlanBlackBoardControl.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/blackboard/NoPlanBlackBoardControl.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/blackboard/NoPlanBlackBoardControl.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -26,183 +26,216 @@
import org.openbbs.blackboard.filter.KindOfFilter;
import org.openbbs.blackboard.ks.KSExecutionContext;
import org.openbbs.blackboard.ks.KnowledgeSource;
+
/**
- * The all-in-one no plan all you need approach. everything to make the blackbaord run is in this class.
- * Just implement some Knowledgesources, instantiate this class with them and you'll be fine. As long as
- * every Knowledge source can determine just from the content of the zone what if is should perform its task or not.
- * And also it has to know if already has performed. Easy.
+ * The all-in-one no plan all you need approach. everything to make the
+ * blackbaord run is in this class. Just implement some Knowledgesources,
+ * instantiate this class with them and you'll be fine. As long as every
+ * Knowledge source can determine just from the content of the zone what if is
+ * should perform its task or not. And also it has to know if already has
+ * performed. Easy.
+ *
* @author joerg
- *
+ *
*/
public class NoPlanBlackBoardControl implements BlackboardObserver {
-
+
private Log log = LogFactory.getLog(NoPlanBlackBoardControl.class);
-
-
+
private Blackboard bboard;
+
private List<KnowledgeSource> ksources = new ArrayList<KnowledgeSource>();
-
-
- public KSExecutionContext newZonedAccess(){
+ public KSExecutionContext newZonedAccess() {
final Zone nz = openRandomNamedZone();
- return new KSExecutionContext(){
+ return new KSExecutionContext() {
public BlackboardAccess blackboard() {
-
- return new ZonedBlackboardAccess(NoPlanBlackBoardControl.this.bboard,nz);
+
+ return new ZonedBlackboardAccess(
+ NoPlanBlackBoardControl.this.bboard, nz);
}
public BlackboardAccess blackboard(Zone zone) {
-
- return new ZonedBlackboardAccess(NoPlanBlackBoardControl.this.bboard,zone);
+
+ return new ZonedBlackboardAccess(
+ NoPlanBlackBoardControl.this.bboard, zone);
}
-
+
};
}
-
private Zone openRandomNamedZone() {
- final NamedZone nz = new NamedZone(System.currentTimeMillis()+RandomStringUtils.randomAlphanumeric(8));
+ final NamedZone nz = new NamedZone(System.currentTimeMillis()
+ + RandomStringUtils.randomAlphanumeric(8));
this.bboard.openZone(nz);
this.log.debug("opened a new zone on the blackboard: " + nz.name());
return nz;
}
-
+
/**
- * a special zone on the blackboard dedicated for keeping track of the configuration. Changes made to this context will not notify any of the knowledgesource, use <code>propagateConfiguration</code> instead. Updating this zone is done in the yoperator application by the <code>SErializingPersonalDAtastore</code> Knowledgesource
+ * a special zone on the blackboard dedicated for keeping track of the
+ * configuration. Changes made to this context will not notify any of the
+ * knowledgesource, use <code>propagateConfiguration</code> instead.
+ * Updating this zone is done in the yoperator application by the
+ * <code>SErializingPersonalDAtastore</code> Knowledgesource
+ *
* @return
*/
- public KSExecutionContext getConfigurationContext(){
- return new KSExecutionContext(){
+ public KSExecutionContext getConfigurationContext() {
+ return new KSExecutionContext() {
public BlackboardAccess blackboard() {
-
- return new ZonedBlackboardAccess(NoPlanBlackBoardControl.this.bboard,Constants.CONFIGURATION_ZONE);
+
+ return new ZonedBlackboardAccess(
+ NoPlanBlackBoardControl.this.bboard,
+ Constants.CONFIGURATION_ZONE);
}
public BlackboardAccess blackboard(Zone zone) {
-
- return new ZonedBlackboardAccess(NoPlanBlackBoardControl.this.bboard,zone);
+
+ return new ZonedBlackboardAccess(
+ NoPlanBlackBoardControl.this.bboard, zone);
}
-
+
};
}
-
-
-
-
public NoPlanBlackBoardControl(Blackboard bboard) {
super();
this.bboard = bboard;
bboard.openZone(Constants.CONFIGURATION_ZONE);
-
- bboard.registerInterest(new ZoneSelector(){
+ bboard.registerInterest(new ZoneSelector() {
public boolean selects(Zone zone) {
- if(zone.equals(Constants.CONFIGURATION_ZONE)){
+ if (zone.equals(Constants.CONFIGURATION_ZONE)) {
return false;
- }else{
+ } else {
return true;
}
-
+
}
}, this);
}
-
- public void registerKnowledgeSource(KnowledgeSource ks){
+
+ public void registerKnowledgeSource(KnowledgeSource ks) {
this.ksources.add(ks);
}
-
-
-
- public void blackboardDidAddEntry(final Blackboard blackboard, final Zone zone, final Object entry) {
+
+ public void blackboardDidAddEntry(final Blackboard blackboard,
+ final Zone zone, final Object entry) {
this.log.debug("New Entry on Blackboard: " + entry.toString());
- KSExecutionContext context = new KSExecutionContext(){
+ KSExecutionContext context = new KSExecutionContext() {
public BlackboardAccess blackboard() {
-
- return new ZonedBlackboardAccess(blackboard,zone);
+
+ return new ZonedBlackboardAccess(blackboard, zone);
}
+
public BlackboardAccess blackboard(Zone zo) {
// TODO Auto-generated method stub
- return new ZonedBlackboardAccess(blackboard,zo);
+ return new ZonedBlackboardAccess(blackboard, zo);
}
};
-
- for (KnowledgeSource source : this.ksources) {
- if(source.isEnabled(context)){
- source.execute(context);
+
+
+ for (KnowledgeSource source : this.ksources) {
+ if (source.isEnabled(context)) {
+ source.execute(context);
+ }
+
}
-
- }
-
+
}
- public void blackboardDidRemoveEntry(Blackboard blackboard, Zone zone, Object entry) {
-
+
+ public void blackboardDidRemoveEntry(Blackboard blackboard, Zone zone,
+ Object entry) {
+
}
+
/**
- * puts a message into the blackboard and registers the messages in the appropriate chat zone
+ * puts a message into the blackboard and registers the messages in the
+ * appropriate chat zone
+ *
* @param message
* @param chat
*/
- public void registerMessage(Message message, Chat chat){
+ public void registerMessage(Message message, Chat chat) {
Zone chatzone = new NamedZone(chat.getThreadID());
-
- if(!this.bboard.exists(new ExactZoneSelector(chatzone), new KindOfFilter(List.class))){
- //create a zone for the chat
+
+ if (!this.bboard.exists(new ExactZoneSelector(chatzone),
+ new KindOfFilter(List.class))) {
+ // create a zone for the chat
this.bboard.openZone(chatzone);
- this.bboard.write(chatzone, Collections.synchronizedList(new ArrayList<Zone>()));
+ this.bboard.write(chatzone, Collections
+ .synchronizedList(new ArrayList<Zone>()));
}
-
- List<Zone> messagesOfChat = (List<Zone>) this.bboard.take(new ExactZoneSelector(chatzone), new KindOfFilter(List.class));
+
+ List<Zone> messagesOfChat = (List<Zone>) this.bboard.take(
+ new ExactZoneSelector(chatzone), new KindOfFilter(List.class));
Zone newMessageZone = openRandomNamedZone();
messagesOfChat.add(newMessageZone);
- //the chat to which this message belongs is written to the blackboard, to allow later referencing
+ // the chat to which this message belongs is written to the blackboard,
+ // to allow later referencing
this.bboard.write(newMessageZone, chat);
- //and finally we write the message to the zone
+ // and finally we write the message to the zone
this.bboard.write(newMessageZone, message);
-
+
}
-
+
public Blackboard getBboard() {
return this.bboard;
}
-
+
/**
- * writes a configuration element to the blackboard on a new zone and deletes it afterwards. Thus
- * @param conf
+ * writes a configuration element to the blackboard on a new zone and
+ * deletes it afterwards. Thus
+ *
+ * @param conf
*/
- public void propagateConfiguration(KSConfiguration conf){
+ public void propagateConfiguration(KSConfiguration conf) {
Zone tmpzone = openRandomNamedZone();
this.bboard.write(tmpzone, conf);
this.bboard.closeZone(tmpzone);
}
-
-
- public Set<SPARQLResult> executeQuery(SPARQLQuery query, KSExecutionContext context){
+
+ public Set<SPARQLResult> executeQuery(SPARQLQuery query,
+ KSExecutionContext context) {
+
+ return executeQuery(query, context, 0);
+ }
+
+ public Set<SPARQLResult> executeQuery(SPARQLQuery query,
+ KSExecutionContext context, int waitForCollection) {
Zone tmpzone = openRandomNamedZone();
- this.bboard.write(tmpzone, context.blackboard().read(new KindOfFilter(Chat.class)));
+ this.bboard.write(tmpzone, context.blackboard().read(
+ new KindOfFilter(Chat.class)));
this.bboard.write(tmpzone, query);
-
-
- Set resultset = this.bboard.readAll(new ExactZoneSelector(tmpzone), new KindOfFilter(SPARQLResult.class));
+ if (waitForCollection > 0) {
+ try {
+ Thread.sleep(waitForCollection);
+ } catch (InterruptedException e) {
+ log.error("Error: cant sleep");
+ }
+ }
- this.bboard.closeZone(tmpzone);
-
- return resultset;
+ Set resultset = this.bboard.readAll(new ExactZoneSelector(tmpzone),
+ new KindOfFilter(SPARQLResult.class));
+
+ this.bboard.closeZone(tmpzone);
+
+ return resultset;
}
- public Set<SPARQLResult> executeQuery(SPARQLQuery query){
+
+ public Set<SPARQLResult> executeQuery(SPARQLQuery query) {
Zone tmpzone = openRandomNamedZone();
this.bboard.write(tmpzone, query);
-
-
- Set resultset = this.bboard.readAll(new ExactZoneSelector(tmpzone), new KindOfFilter(SPARQLResult.class));
-
- this.bboard.closeZone(tmpzone);
-
- return resultset;
+ Set resultset = this.bboard.readAll(new ExactZoneSelector(tmpzone),
+ new KindOfFilter(SPARQLResult.class));
+
+ this.bboard.closeZone(tmpzone);
+
+ return resultset;
}
}
Modified: trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeTransientMemory.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeTransientMemory.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeTransientMemory.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -20,8 +21,8 @@
public class ThreadsafeTransientMemory implements BlackboardMemory,
SnapshottableMemory, Serializable {
- private Map<Zone, Set<Object>> zones = new ConcurrentHashMap<Zone, Set<Object>>();
-
+ //private Map<Zone, Set<Object>> zones = new ConcurrentHashMap<Zone, Set<Object>>();
+ private Map<Zone, Set<Object>> zones = Collections.synchronizedMap(new HashMap<Zone, Set<Object>>());
//private Map<Object, Zone> entries = new ConcurrentHashMap<Object, Zone>();
private Log log = LogFactory.getLog(ThreadsafeTransientMemory.class);
Modified: trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLQuery.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLQuery.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/rdfxmpp/SPARQLQuery.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -53,6 +53,8 @@
public final static String TXT_OUTPUT = "TXT";
public final static String P2P = "P2P";
+
+ private boolean localAsked = false;
private int htl = 1;
@@ -67,6 +69,12 @@
public List<String> getAgentsToAsk() {
return agentsToAsk;
}
+ public boolean isLocalAsked() {
+ return localAsked;
+ }
+ public void setLocalAsked(boolean localAsked) {
+ this.localAsked = localAsked;
+ }
private SPARQLResult result = null;
Modified: trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -235,16 +235,29 @@
CommandLineMain main = new CommandLineMain();
main.startUp(args);
- int exit = 0;
+ Object obj = new Object();
try {
- while (exit!=-1) {
- exit = System.in.read();
+ synchronized (obj) {
+ obj.wait();
}
-
- } catch (IOException e) {
+
+ } catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+
+
+// int exit = 0;
+// try {
+// while (exit!=-1) {
+// //exit = System.in.read();
+//
+// }
+//
+// } catch (IOException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
}
}
Modified: trunk/xOperator/src/net/sf/xoperator/ui/aiml/TemplateExectutionContext.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/TemplateExectutionContext.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/TemplateExectutionContext.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -51,12 +51,14 @@
List<SPARQLResultTableWrapper> results = new ArrayList<SPARQLResultTableWrapper>();
SPARQLQuery squery = new SPARQLQuery(query);
squery.setOutputType(SPARQLQuery.XML_OUTPUT);
- if (stores != null && !stores.isEmpty()) {
- squery.setStoresToAsk(stores);
- }
- if (agents != null && !agents.isEmpty()) {
- squery.setAgentsToAsk(agents);
- }
+// if (stores != null && !stores.isEmpty()) {
+// squery.setStoresToAsk(stores);
+// }
+// if (agents != null && !agents.isEmpty()) {
+// squery.setAgentsToAsk(agents);
+// }
+ squery.setStoresToAsk(stores);
+ squery.setAgentsToAsk(agents);
for (Object oresult : control.executeQuery(squery,context)) {
SPARQLResultTableWrapper wrappedResult = new SPARQLResultTableWrapper(
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-01-17 20:28:15 UTC (rev 102)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-01-17 21:03:32 UTC (rev 103)
@@ -176,8 +176,14 @@
new KindOfFilter(Chat.class));
if (chat != null) {
- Set messages = context.blackboard().readAll(
+ Set mess = context.blackboard().readAll(
new KindOfFilter(MessageToUser.class));
+ List messages = new ArrayList<MessageToUser>();
+
+ for (Object object : mess) {
+ messages.add(object);
+ }
+
Set sendMsgNote = context.blackboard().readAll(
new KindOfFilter(MessageSend.class));
if (messages.size() > sendMsgNote.size()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-17 20:28:22
|
Revision: 102
http://xoperator.svn.sourceforge.net/xoperator/?rev=102&view=rev
Author: tomatop
Date: 2008-01-17 12:28:15 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,58 @@
+/////////////////////////////////////////////
+/// Implementation of the simple template "Tell me * of *"
+/////////////////////////////////////////////
+sparqlresult=""
+//context.sendMessageToUser("ok, I'll try find out this.")
+
+// fetching the log
+log = context.getLog()
+
+// the wildcards
+wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
+wildcard2 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,2).trim();
+
+//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
+//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
+FromPart = "FROM <http://xmlns.com/foaf/spec/index.rdf> "
+
+// where can we find infos about the subject
+documentQuery = "SELECT DISTINCT ?document "+
+ FromPart+
+ "WHERE{?s ?p1 ?subjectpattern. ?s <http://www.w3.org/2000/01/rdf-schema#seeAlso> ?document."+
+ "FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i').}"
+log.info(documentQuery)
+//context.sendMessageToUser(documentQuery)
+
+documents = context.queryForTable(documentQuery,null,null)
+FromNamedPart = ""
+documents.each(){
+ res = it
+ log.info(res.getResultCount())
+ // res.getResultRows returns a List of Maps. Each map represents a row, with the headline as key.
+ res.getResultRows().each(){
+ //log.info("Hohoho: ${it["ypsilon"]} is a ${it["x"]}")
+ FromNamedPart += "FROM <${it["document"]}> \n"
+ log.info(it["document"])
+ }
+}
+
+valueQuery = "SELECT DISTINCT ?value "+
+ FromPart+
+ FromNamedPart+
+ "WHERE {?s ?p1 ?subjectpattern. ?s ?p2 ?value. ?p2 ?property ?propertypattern. FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i'). FILTER regex(?propertypattern, '.*"+wildcard1+".*', 'i')}"
+log.info(valueQuery)
+//context.sendMessageToUser(valueQuery)
+
+counter = 0;
+values = context.queryForTable(valueQuery,null,null)
+values.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ log.info(it["value"])
+ context.sendMessageToUser(it["value"])
+ }
+}
+if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
+
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,36 @@
+/////////////////////////////////////////////
+/// Who is member of *
+/////////////////////////////////////////////
+sparqlresult=""
+//context.sendMessageToUser("ok, I'll try find out this.")
+
+//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
+//context.sendMessageToUser(now)
+
+// fetching the log
+log = context.getLog()
+
+// the wildcards
+wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
+
+// query for member names
+memberQuery = "SELECT DISTINCT ?name FROM <http://xmlns.com/foaf/spec/index.rdf> WHERE {"+
+ "?s ?p1 ?subjectpattern. ?s <http://xmlns.com/foaf/0.1/member> ?person. ?person <http://xmlns.com/foaf/0.1/name> ?name."+
+ "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
+log.info(memberQuery)
+//context.sendMessageToUser(documentQuery)
+
+counter = 0;
+members = context.queryForTable(memberQuery,null,null)
+members.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ log.info(it["name"])
+ context.sendMessageToUser(" * "+it["name"])
+ }
+}
+if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
+
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,60 @@
+/////////////////////////////////////////////
+/// Implementation of the simple template "Tell me * of *"
+/////////////////////////////////////////////
+sparqlresult=""
+//context.sendMessageToUser("ok, I'll try find out this.")
+
+//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
+//context.sendMessageToUser(now)
+
+// fetching the log
+log = context.getLog()
+
+// the wildcards
+wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
+wildcard2 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,2).trim();
+
+//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
+//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
+//FromPart = "FROM <http:xmlns.com/foaf/spec/index.rdf> "
+//
+// where can we find infos about the subject
+//documentQuery = "SELECT DISTINCT ?document "+
+// FromPart+
+// "WHERE{?s ?p1 ?subjectpattern. ?s <http:www.w3.org/2000/01/rdf-schema#seeAlso> ?document."+
+// "FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i').}"
+//log.info(documentQuery)
+//context.sendMessageToUser(documentQuery)
+//
+//documents = context.queryForTable(documentQuery,null,null)
+//FromNamedPart = ""
+//documents.each(){
+// res = it
+// log.info(res.getResultCount())
+// res.getResultRows().each(){
+// FromNamedPart += "FROM <${it["document"]}> \n"
+// log.info(it["document"])
+// }
+//}
+
+valueQuery = "SELECT DISTINCT ?value "+
+// FromPart+
+// FromNamedPart+
+ "WHERE {?s ?p1 ?subjectpattern. ?s ?p2 ?value. ?p2 ?property ?propertypattern. FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i'). FILTER regex(?propertypattern, '.*"+wildcard1+".*', 'i')}"
+log.info(valueQuery)
+//context.sendMessageToUser(valueQuery)
+
+counter = 0;
+values = context.queryForTable(valueQuery,["ontowiki"],null)
+values.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ log.info(it["value"])
+ context.sendMessageToUser(" * "+it["value"])
+ }
+}
+if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
+
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,70 @@
+/////////////////////////////////////////////
+/// Implementation of "WHERE IS * NOW"
+/////////////////////////////////////////////
+sparqlresult=""
+//context.sendMessageToUser("ok, I'll try find out this.")
+
+now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
+//context.sendMessageToUser(now)
+
+// fetching the log
+log = context.getLog()
+
+// the wildcards
+wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
+
+//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
+//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
+PREFIX = "PREFIX ical: <http://www.w3.org/2002/12/cal/ical#>\nPREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
+FromPart = "FROM <http://xmlns.com/foaf/spec/index.rdf> "
+
+// where can we find infos about the subject
+documentQuery = PREFIX + "SELECT DISTINCT ?document "+
+// FromPart+
+ "WHERE{?s ?p1 ?subjectpattern. ?s rdfs:seeAlso ?document.\n"+
+ "?document rdf:type ical:Vcalendar.\n"+
+ "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
+log.info(documentQuery)
+//context.sendMessageToUser(documentQuery)
+
+documents = context.queryForTable(documentQuery,["ontowiki"],null)
+counter = 0;
+FromNamedPart = ""
+documents.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ FromNamedPart += "FROM NAMED <${it["document"]}> \n"
+ log.info(it["document"])
+ }
+}
+
+if(counter < 1) context.sendMessageToUser("Sorry, I did not found any calendar in relation to '"+wildcard1+"'")
+else{
+ context.sendMessageToUser("I have found "+counter+" calendar documents which are in relation '"+wildcard1+"' ...")
+ whereQuery = PREFIX + "SELECT DISTINCT ?location ?graph ?g ?summary\n"+
+ FromNamedPart+
+ "WHERE { GRAPH ?g { \n"+
+ "?s ical:dtstart ?sbn. ?sbn ical:dateTime ?stime. \n"+
+ "?s ical:dtend ?ebn. ?ebn ical:dateTime ?etime. \n"+
+ "?s ical:location ?location. \n"+
+ "?s ical:summary ?summary. \n"+
+ "FILTER (?stime < '"+now+"') \n"+
+ "FILTER (?etime > '"+now+"') \n"+
+ "} OPTIONAL {?g rdfs:label ?graph} }"
+
+ //context.sendMessageToUser(whereQuery)
+ locations = context.queryForTable(whereQuery,["generic"],null)
+ counter = 0;
+ locations.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ log.info(it["location"])
+ context.sendMessageToUser(it["location"] + " (summary: " + it["summary"] + ")")
+ }
+ }
+}
+
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,38 @@
+// fetching the log
+log = context.getLog()
+
+//sample query
+
+//context is a instance of net.sf.xoperator.ui.aiml.TemplateExecutionContext
+
+resultset = context.queryForTable("select distinct ?x, ?ypsilon WHERE {?ypsilon a ?x } LIMIT 10",null,[])
+
+resultset.each(){
+
+ res = it
+ log.info(res.getResultCount())
+ // res.getResultRows returns a List of Maps. Each map represents a row, with the headline as key.
+ res.getResultRows().each(){
+ log.info("Hohoho: ${it["ypsilon"]} is a ${it["x"]}")
+
+ }
+
+
+ res.getHeadlines().each{
+ log.info("Headline: ${it} contains:");
+
+ res.getResultColumnAsStrings(it).each(){
+ log.info(it)
+ }
+
+ res.getResultColumnAsElements(it).each(){
+ log.info("${it.text} is of type ${it.name}")
+ }
+ }
+}
+
+sparqlresult ="select distinct ?x WHERE {?y a ?x } LIMIT 10"
+
+
+
+
Added: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy (rev 0)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy 2008-01-17 20:28:15 UTC (rev 102)
@@ -0,0 +1,36 @@
+/////////////////////////////////////////////
+/// Tell me more about *
+/////////////////////////////////////////////
+sparqlresult=""
+//context.sendMessageToUser("ok, I'll try find out this.")
+
+//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
+//context.sendMessageToUser(now)
+
+// fetching the log
+log = context.getLog()
+
+// the wildcards
+wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
+
+// query for member names
+memberQuery = "SELECT DISTINCT ?name FROM <http://xmlns.com/foaf/spec/index.rdf> WHERE {"+
+ "?s ?p1 ?subjectpattern. ?s <http://xmlns.com/foaf/0.1/member> ?person. ?person <http://xmlns.com/foaf/0.1/name> ?name."+
+ "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
+log.info(memberQuery)
+//context.sendMessageToUser(documentQuery)
+
+counter = 0;
+members = context.queryForTable(memberQuery,null,null)
+members.each(){
+ res = it
+ counter = counter + res.getResultCount()
+ if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
+ log.info(res.getResultCount())
+ res.getResultRows().each(){
+ log.info(it["name"])
+ context.sendMessageToUser(" * "+it["name"])
+ }
+}
+if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-17 20:27:50
|
Revision: 101
http://xoperator.svn.sourceforge.net/xoperator/?rev=101&view=rev
Author: tomatop
Date: 2008-01-17 12:27:52 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Removed Paths:
-------------
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy
trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupAttributes.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////
-/// Implementation of the simple template "Tell me * of *"
-/////////////////////////////////////////////
-sparqlresult=""
-//context.sendMessageToUser("ok, I'll try find out this.")
-
-// fetching the log
-log = context.getLog()
-
-// the wildcards
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-wildcard2 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,2).trim();
-
-//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
-//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
-FromPart = "FROM <http://xmlns.com/foaf/spec/index.rdf> "
-
-// where can we find infos about the subject
-documentQuery = "SELECT DISTINCT ?document "+
- FromPart+
- "WHERE{?s ?p1 ?subjectpattern. ?s <http://www.w3.org/2000/01/rdf-schema#seeAlso> ?document."+
- "FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i').}"
-log.info(documentQuery)
-//context.sendMessageToUser(documentQuery)
-
-documents = context.queryForTable(documentQuery,null,null)
-FromNamedPart = ""
-documents.each(){
- res = it
- log.info(res.getResultCount())
- // res.getResultRows returns a List of Maps. Each map represents a row, with the headline as key.
- res.getResultRows().each(){
- //log.info("Hohoho: ${it["ypsilon"]} is a ${it["x"]}")
- FromNamedPart += "FROM <${it["document"]}> \n"
- log.info(it["document"])
- }
-}
-
-valueQuery = "SELECT DISTINCT ?value "+
- FromPart+
- FromNamedPart+
- "WHERE {?s ?p1 ?subjectpattern. ?s ?p2 ?value. ?p2 ?property ?propertypattern. FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i'). FILTER regex(?propertypattern, '.*"+wildcard1+".*', 'i')}"
-log.info(valueQuery)
-//context.sendMessageToUser(valueQuery)
-
-counter = 0;
-values = context.queryForTable(valueQuery,null,null)
-values.each(){
- res = it
- counter = counter + res.getResultCount()
- log.info(res.getResultCount())
- res.getResultRows().each(){
- log.info(it["value"])
- context.sendMessageToUser(it["value"])
- }
-}
-if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
-
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafGroupMember.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////
-/// Who is member of *
-/////////////////////////////////////////////
-sparqlresult=""
-//context.sendMessageToUser("ok, I'll try find out this.")
-
-//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
-//context.sendMessageToUser(now)
-
-// fetching the log
-log = context.getLog()
-
-// the wildcards
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-
-// query for member names
-memberQuery = "SELECT DISTINCT ?name FROM <http://xmlns.com/foaf/spec/index.rdf> WHERE {"+
- "?s ?p1 ?subjectpattern. ?s <http://xmlns.com/foaf/0.1/member> ?person. ?person <http://xmlns.com/foaf/0.1/name> ?name."+
- "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
-log.info(memberQuery)
-//context.sendMessageToUser(documentQuery)
-
-counter = 0;
-members = context.queryForTable(memberQuery,null,null)
-members.each(){
- res = it
- counter = counter + res.getResultCount()
- if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
- log.info(res.getResultCount())
- res.getResultRows().each(){
- log.info(it["name"])
- context.sendMessageToUser(" * "+it["name"])
- }
-}
-if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
-
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/foafPersonAttributes.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////
-/// Implementation of the simple template "Tell me * of *"
-/////////////////////////////////////////////
-sparqlresult=""
-//context.sendMessageToUser("ok, I'll try find out this.")
-
-//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
-//context.sendMessageToUser(now)
-
-// fetching the log
-log = context.getLog()
-
-// the wildcards
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-wildcard2 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,2).trim();
-
-//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
-//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
-FromPart = "FROM <http://xmlns.com/foaf/spec/index.rdf> "
-
-// where can we find infos about the subject
-documentQuery = "SELECT DISTINCT ?document "+
- FromPart+
- "WHERE{?s ?p1 ?subjectpattern. ?s <http://www.w3.org/2000/01/rdf-schema#seeAlso> ?document."+
- "FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i').}"
-log.info(documentQuery)
-//context.sendMessageToUser(documentQuery)
-
-documents = context.queryForTable(documentQuery,null,null)
-FromNamedPart = ""
-documents.each(){
- res = it
- log.info(res.getResultCount())
- res.getResultRows().each(){
- FromNamedPart += "FROM <${it["document"]}> \n"
- log.info(it["document"])
- }
-}
-
-valueQuery = "SELECT DISTINCT ?value "+
- FromPart+
- FromNamedPart+
- "WHERE {?s ?p1 ?subjectpattern. ?s ?p2 ?value. ?p2 ?property ?propertypattern. FILTER regex(?subjectpattern, '.*"+wildcard2+".*', 'i'). FILTER regex(?propertypattern, '.*"+wildcard1+".*', 'i')}"
-log.info(valueQuery)
-//context.sendMessageToUser(valueQuery)
-
-counter = 0;
-values = context.queryForTable(valueQuery,null,null)
-values.each(){
- res = it
- counter = counter + res.getResultCount()
- if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
- log.info(res.getResultCount())
- res.getResultRows().each(){
- log.info(it["value"])
- context.sendMessageToUser(" * "+it["value"])
- }
-}
-if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
-
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/iCalWhereNow.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////
-/// Implementation of "WHERE IS * NOW"
-/////////////////////////////////////////////
-sparqlresult=""
-//context.sendMessageToUser("ok, I'll try find out this.")
-
-now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
-//context.sendMessageToUser(now)
-
-// fetching the log
-log = context.getLog()
-
-// the wildcards
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-
-//FROM = "http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml"
-//FROM = "http://sebastian.dietzold.de/rdf/foaf.rdf"
-PREFIX = "PREFIX ical: <http://www.w3.org/2002/12/cal/ical#>\nPREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-FromPart = "FROM <http://xmlns.com/foaf/spec/index.rdf> "
-
-// where can we find infos about the subject
-documentQuery = PREFIX + "SELECT DISTINCT ?document "+
- FromPart+
- "WHERE{?s ?p1 ?subjectpattern. ?s rdfs:seeAlso ?document.\n"+
- "?document rdf:type ical:Vcalendar.\n"+
- "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
-log.info(documentQuery)
-//context.sendMessageToUser(documentQuery)
-
-documents = context.queryForTable(documentQuery,null,null)
-counter = 0;
-FromNamedPart = ""
-documents.each(){
- res = it
- counter = counter + res.getResultCount()
- log.info(res.getResultCount())
- res.getResultRows().each(){
- FromNamedPart += "FROM NAMED <${it["document"]}> \n"
- log.info(it["document"])
- }
-}
-
-if(counter < 1) context.sendMessageToUser("Sorry, I did not found any calendar in relation to '"+wildcard1+"'")
-else{
- context.sendMessageToUser("I have found "+counter+" calendar documents which are in relation '"+wildcard1+"' ...")
- whereQuery = PREFIX + "SELECT DISTINCT ?location ?graph ?g ?summary\n"+
- FromNamedPart+
- "WHERE { GRAPH ?g { \n"+
- "?s ical:dtstart ?sbn. ?sbn ical:dateTime ?stime. \n"+
- "?s ical:dtend ?ebn. ?ebn ical:dateTime ?etime. \n"+
- "?s ical:location ?location. \n"+
- "?s ical:summary ?summary. \n"+
- "FILTER (?stime < '"+now+"') \n"+
- "FILTER (?etime > '"+now+"') \n"+
- "} OPTIONAL {?g rdfs:label ?graph} }"
-
- //context.sendMessageToUser(whereQuery)
- locations = context.queryForTable(whereQuery,null,null)
- counter = 0;
- locations.each(){
- res = it
- counter = counter + res.getResultCount()
- log.info(res.getResultCount())
- res.getResultRows().each(){
- log.info(it["location"])
- context.sendMessageToUser(it["location"] + " (summary: " + it["summary"] + ")")
- }
- }
-}
-
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/sample.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,125 +0,0 @@
-// fetching the log
-log = context.getLog()
-
-//sample query
-
-//context is a instance of net.sf.xoperator.ui.aiml.TemplateExecutionContext
-
-resultset = context.queryForTable("select distinct ?x, ?ypsilon WHERE {?ypsilon a ?x } LIMIT 10",null,null)
-
-resultset.each(){
-
- res = it
- log.info(res.getResultCount())
- // res.getResultRows returns a List of Maps. Each map represents a row, with the headline as key.
- res.getResultRows().each(){
- log.info("Hohoho: ${it["ypsilon"]} is a ${it["x"]}")
-
- }
-
-
- res.getHeadlines().each{
- log.info("Headline: ${it} contains:");
-
- res.getResultColumnAsStrings(it).each(){
- log.info(it)
- }
-
- res.getResultColumnAsElements(it).each(){
- log.info("${it.text} is of type ${it.name}")
- }
- }
-}
-
-sparqlresult ="select distinct ?x WHERE {?y a ?x } LIMIT 10"
-*/
-
-
-
-
-
-
-//***********************************
-
-// log message
-log.info("seebi.groovy: start")
-
-//we will have the following variables for an easy access
-//$wildcards, an array of the wilcards of the pattern, filled with the appropriate values
-//$roster, the xmpp roster
-//$stores, the data stores
-
-//in the end the values of the variables have to be set to approriate values, but anyway
-
-// this is an object of the namespace manager class
-// namespaces.toSparqlPrefix -> sparql prefix string "PREFIX ical: ..."
-toSparqlPrefix = "PREFIX ical: <http://www.w3.org/2002/12/cal/ical#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
-
-wildcards = []
-storesToAsk = []
-friendsToAks = []
-groupsToAsk = []
-sparqlresult = ""
-
-context.sendMessageToUser("ok, I'll try find out this.")
-/////////////////////////////////////////////
-/// Implementation of the simple template "Tell me * of *"
-/////////////////////////////////////////////
-wildcards = ["Raum", "Frank"]
-sparqlresult = "SELECT DISTINCT ?value FROM <http://bis.ontowiki.net/> WHERE {?s ?p1 ?subjectpattern. ?s ?p2 ?value. ?p2 ?property ?propertypattern. FILTER regex(?subjectpattern, '.*"+wildcards[1]+".*', 'i'). FILTER regex(?propertypattern, '.*"+wildcards[0]+".*', 'i')}"
-/////////////////////////////////////////////
-sparqlresult = ""
-
-/////////////////////////////////////////////
-/// Implementation of the subtemplate "Where the hell is *"
-/// this is usable with the generic datastore http://www.sparql.org/sparql
-/////////////////////////////////////////////
-wildcards = ["Dietzold"]
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-log.info("wildcard1: " + wildcard1)
-
-// this is a subquery
-iCalsRequest = toSparqlPrefix +"SELECT DISTINCT ?g "+
- "FROM <http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml> "+
- "WHERE { "+
- "?person ?labelprop ?labelpattern. ?person rdfs:seeAlso ?g. "+
- "?g rdf:type ical:Vcalendar. "+
- "FILTER regex(?labelpattern, '.*"+wildcard1+".*', 'i')}"
-log.info(iCalsRequest)
-
-// generate the from-part from the calendar URIs
-FromNamedPart = ""
-iCals = context.queryForTable(iCalsRequest,null,null)
-iCals[0].getResultRowAsStrings("g").each(){
- log.info(it)
- FromNamedPart += "FROM NAMED <" + it + "> \n"
-}
-
-// we do not have the now method so this is static to
-now = "2007-11-23T17:00:00"
-sparqlresult = toSparqlPrefix +"SELECT DISTINCT ?location ?graph \n"+
- "FROM <http://demo.ontowiki.net/model/export/?m=http%3A%2F%2Fbis.ontowiki.net%2F&output=xml> \n"+
- FromNamedPart+
- "WHERE { GRAPH ?g { \n"+
- "?s ical:dtstart ?sbn. ?sbn ical:dateTime ?stime. \n"+
- "?s ical:dtend ?ebn. ?ebn ical:dateTime ?etime. \n"+
- "?s ical:location ?location. \n"+
- "FILTER (?stime < '"+now+"') \n"+
- "FILTER (?etime > '"+now+"') \n"+
- "} OPTIONAL {?g rdfs:label ?graph} }"
-//println sparqlresult
-/////////////////////////////////////////////
-log.info(sparqlresult)
-results = context.queryForTable(sparqlresult,null,null)
-results[0].getResultRowAsStrings("location").each(){
- context.sendMessageToUser(it)
- // hier bitte den richtigen code rein
- context.sendMessageToUser("According to g, he/she is in 'location'")
-}
-
-
-
-sparqlresult = ""
-// log message
-log.info("seebi.groovy: end")
-
Deleted: trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy 2008-01-17 11:51:28 UTC (rev 100)
+++ trunk/xOperator/src/net/sf/xoperator/ui/aiml/conf/templates/tellMeMoreAbout.groovy 2008-01-17 20:27:52 UTC (rev 101)
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////
-/// Tell me more about *
-/////////////////////////////////////////////
-sparqlresult=""
-//context.sendMessageToUser("ok, I'll try find out this.")
-
-//now = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date())
-//context.sendMessageToUser(now)
-
-// fetching the log
-log = context.getLog()
-
-// the wildcards
-wildcard1 = match.wildcard(bitoflife.chatterbean.Match.Section.PATTERN,1).trim();
-
-// query for member names
-memberQuery = "SELECT DISTINCT ?name FROM <http://xmlns.com/foaf/spec/index.rdf> WHERE {"+
- "?s ?p1 ?subjectpattern. ?s <http://xmlns.com/foaf/0.1/member> ?person. ?person <http://xmlns.com/foaf/0.1/name> ?name."+
- "FILTER regex(?subjectpattern, '.*"+wildcard1+".*', 'i').}"
-log.info(memberQuery)
-//context.sendMessageToUser(documentQuery)
-
-counter = 0;
-members = context.queryForTable(memberQuery,null,null)
-members.each(){
- res = it
- counter = counter + res.getResultCount()
- if (res.getResultCount() > 0) context.sendMessageToUser("From " + res.getStoreName() + ":")
- log.info(res.getResultCount())
- res.getResultRows().each(){
- log.info(it["name"])
- context.sendMessageToUser(" * "+it["name"])
- }
-}
-if(counter == 0) context.sendMessageToUser("Sorry, I can't answer your question.")
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-17 12:06:06
|
Revision: 100
http://xoperator.svn.sourceforge.net/xoperator/?rev=100&view=rev
Author: tomatop
Date: 2008-01-17 03:51:28 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
agent exits only on ctrl+c from the command line
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
Modified: trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-11 01:36:53 UTC (rev 99)
+++ trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-17 11:51:28 UTC (rev 100)
@@ -70,9 +70,10 @@
*/
public class CommandLineMain {
{
- //PropertyConfigurator.configure();
- //new PropertyConfigurator();
+ // PropertyConfigurator.configure();
+ // new PropertyConfigurator();
}
+
Options options = new Options();
private Log log = LogFactory.getLog(CommandLineMain.class);
@@ -131,117 +132,115 @@
.withDescription(
"The port of the server to connect to for the roxy account, defaults to 5222")
.create("proxy_port"));
- options
- .addOption(OptionBuilder
- .withArgName("group_agent")
- .hasArg()
- .isRequired(false)
- .withDescription(
+ options.addOption(OptionBuilder.withArgName("group_agent").hasArg()
+ .isRequired(false).withDescription(
"if set to to true, no proxy account will be used")
.create("group_agent"));
- options
- .addOption(OptionBuilder
- .withArgName("p2penabled")
- .hasArg()
- .isRequired(false)
- .withDescription(
+ options.addOption(OptionBuilder.withArgName("p2penabled").hasArg()
+ .isRequired(false).withDescription(
"if set to to true, p2p communication is activated")
.create("p2penabled"));
}
- public void startUp(String[] args){
- log.debug("Starting the application, got the following paramters by the commandline:");
+ public void startUp(String[] args) {
+ log
+ .debug("Starting the application, got the following paramters by the commandline:");
for (String arg : args) {
log.debug(arg);
}
log.debug("End of the argument list");
- System.out.println("Starting the client");
- CommandLineParser parser = new GnuParser();
- AccountInfo main = new AccountInfo();
- AccountInfo proxy = new AccountInfo();
- try {
- CommandLine cl = parser.parse(options, args);
-
- main.setUsername(cl.getOptionValue("main_username"));
- main.setPassword(cl.getOptionValue("main_password"));
- main.setServer(cl.getOptionValue("main_server"));
- main.setPort(cl.getOptionValue("main_port")!=null?Integer.parseInt(cl.getOptionValue("main_port")):null);
-
- main.setStandalone(cl.getOptionValue("group_agent")!=null?Boolean.parseBoolean(cl.getOptionValue("group_agent")):false);
- main.setP2penabled(cl.getOptionValue("p2penabled")!=null?Boolean.getBoolean(cl.getOptionValue("p2penabled")):false);
- main.setMainAccount(true);
-
- if(main.isStandalone()){
- proxy=null;
- }else{
- proxy.setUsername(cl.getOptionValue("proxy_username"));
- proxy.setPassword(cl.getOptionValue("proxy_password"));
- proxy.setServer(cl.getOptionValue("proxy_server"));
- proxy.setPort(cl.getOptionValue("proxy_port")!=null?Integer.parseInt(cl.getOptionValue("proxy_port")):null);
- proxy.setMainAccount(false);
- }
-
-
-
-
- } catch (ParseException e) {
- System.out.println(e.getMessage());
- HelpFormatter hform = new HelpFormatter();
- hform.printHelp("Parameters are: ", options);
- System.exit(0);
- }
-
- Blackboard bboard = new ThreadsafeObjectBlackboard(new NoCloningCloneStrategy());
- NoPlanBlackBoardControl control = new NoPlanBlackBoardControl(bboard);
-
- control.registerKnowledgeSource(new RDFStoreHTTPAdaptor());
- control.registerKnowledgeSource(new XMPPManager(control));
- control.registerKnowledgeSource(new SPARQL2TextTransformer());
- control.registerKnowledgeSource(new LoggingKS(control));
- control.registerKnowledgeSource(new NamespaceKS());
-
- //Constructing the userinterface
-
- List<Interaction> interactions = new ArrayList<Interaction>();
- interactions.add(new QueryCommand());
- interactions.add(new HelpCommand());
- interactions.add(new ListDatastoresCommand());
- interactions.add(new AddDatastoreCommand());
- interactions.add(new RemoveDatastoreCommand());
-
-
- interactions.add(new AddAimlTemplate());
- interactions.add(new ListAimlTemplates());
- interactions.add(new RemoveAimlTemplate());
-
- interactions.add(new AddNamespaceCommand());
- interactions.add(new RemoveNamespaceCommand());
- interactions.add(new ListNamespacesCommand());
-
-
- Interactor interact = new Interactor(interactions,control);
- control.registerKnowledgeSource(new UIDelegate(interact,control));
-
-
- //starting the system by intializing the data store, which loads the configuration
- SerializingPersonalDataStore store = new SerializingPersonalDataStore(control);
- control.registerKnowledgeSource(store);
- store.initialize(main, proxy);
-
-
-
+ System.out.println("Starting the client");
+ CommandLineParser parser = new GnuParser();
+ AccountInfo main = new AccountInfo();
+ AccountInfo proxy = new AccountInfo();
+ try {
+ CommandLine cl = parser.parse(options, args);
- }
+ main.setUsername(cl.getOptionValue("main_username"));
+ main.setPassword(cl.getOptionValue("main_password"));
+ main.setServer(cl.getOptionValue("main_server"));
+ main.setPort(cl.getOptionValue("main_port") != null ? Integer
+ .parseInt(cl.getOptionValue("main_port")) : null);
+ main
+ .setStandalone(cl.getOptionValue("group_agent") != null ? Boolean
+ .parseBoolean(cl.getOptionValue("group_agent"))
+ : false);
+ main
+ .setP2penabled(cl.getOptionValue("p2penabled") != null ? Boolean
+ .getBoolean(cl.getOptionValue("p2penabled"))
+ : false);
+ main.setMainAccount(true);
+
+ if (main.isStandalone()) {
+ proxy = null;
+ } else {
+ proxy.setUsername(cl.getOptionValue("proxy_username"));
+ proxy.setPassword(cl.getOptionValue("proxy_password"));
+ proxy.setServer(cl.getOptionValue("proxy_server"));
+ proxy.setPort(cl.getOptionValue("proxy_port") != null ? Integer
+ .parseInt(cl.getOptionValue("proxy_port")) : null);
+ proxy.setMainAccount(false);
+ }
+
+ } catch (ParseException e) {
+ System.out.println(e.getMessage());
+ HelpFormatter hform = new HelpFormatter();
+ hform.printHelp("Parameters are: ", options);
+ System.exit(0);
+ }
+
+ Blackboard bboard = new ThreadsafeObjectBlackboard(
+ new NoCloningCloneStrategy());
+ NoPlanBlackBoardControl control = new NoPlanBlackBoardControl(bboard);
+
+ control.registerKnowledgeSource(new RDFStoreHTTPAdaptor());
+ control.registerKnowledgeSource(new XMPPManager(control));
+ control.registerKnowledgeSource(new SPARQL2TextTransformer());
+ control.registerKnowledgeSource(new LoggingKS(control));
+ control.registerKnowledgeSource(new NamespaceKS());
+
+ // Constructing the userinterface
+
+ List<Interaction> interactions = new ArrayList<Interaction>();
+ interactions.add(new QueryCommand());
+ interactions.add(new HelpCommand());
+ interactions.add(new ListDatastoresCommand());
+ interactions.add(new AddDatastoreCommand());
+ interactions.add(new RemoveDatastoreCommand());
+
+ interactions.add(new AddAimlTemplate());
+ interactions.add(new ListAimlTemplates());
+ interactions.add(new RemoveAimlTemplate());
+
+ interactions.add(new AddNamespaceCommand());
+ interactions.add(new RemoveNamespaceCommand());
+ interactions.add(new ListNamespacesCommand());
+
+ Interactor interact = new Interactor(interactions, control);
+ control.registerKnowledgeSource(new UIDelegate(interact, control));
+
+ // starting the system by intializing the data store, which loads the
+ // configuration
+ SerializingPersonalDataStore store = new SerializingPersonalDataStore(
+ control);
+ control.registerKnowledgeSource(store);
+ store.initialize(main, proxy);
+
+ }
+
public static void main(String[] args) {
CommandLineMain main = new CommandLineMain();
main.startUp(args);
-
+ int exit = 0;
try {
- System.in.read();
+ while (exit!=-1) {
+ exit = System.in.read();
+ }
+
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-11 01:36:49
|
Revision: 99
http://xoperator.svn.sourceforge.net/xoperator/?rev=99&view=rev
Author: tomatop
Date: 2008-01-10 17:36:53 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
fix the fix [1863959]
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
Modified: trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-11 01:32:32 UTC (rev 98)
+++ trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-11 01:36:53 UTC (rev 99)
@@ -282,7 +282,7 @@
Document doc = new Document();
doc.setRootElement(new Element("aiml"));
for (AIMLTemplate template : aimlconf.values()) {
- if (!template.isPersistet()) {
+// if (!template.isPersistet()) {
// if (template.isObsolete()) {
// // delete it
@@ -295,11 +295,11 @@
// }
if (!template.isObsolete()) {
// delete it
- Element toupdate = locateCategoryElementByPattern(doc,
- template.getPattern());
- if (toupdate != null) {
- toupdate.detach();
- }
+// Element toupdate = locateCategoryElementByPattern(doc,
+// template.getPattern());
+// if (toupdate != null) {
+// toupdate.detach();
+// }
// add a new one
Element cat = new Element("category");
cat.addContent(new Element("pattern")
@@ -318,16 +318,13 @@
change = true;
template.setPersistet(true);
- }
+// }
}
new XMLOutputter(Format.getPrettyFormat()).output(doc,
new FileOutputStream(filepath));
- } catch (JDOMException e) {
+ } catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
return change;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-11 01:32:37
|
Revision: 98
http://xoperator.svn.sourceforge.net/xoperator/?rev=98&view=rev
Author: tomatop
Date: 2008-01-10 17:32:32 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
drop templates fixed [1863959]
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
trunk/xOperator/src/net/sf/xoperator/ui/UIDelegate.java
trunk/xOperator/src/net/sf/xoperator/ui/txt/RemoveAimlTemplate.java
Modified: trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-07 22:23:40 UTC (rev 97)
+++ trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-11 01:32:32 UTC (rev 98)
@@ -92,8 +92,11 @@
configs.put(main.getClass().getCanonicalName() + main.getName(),
main);
- configs.put(proxy.getClass().getCanonicalName() + proxy.getName(),
- proxy);
+ if(proxy!=null){
+ configs.put(proxy.getClass().getCanonicalName() + proxy.getName(),
+ proxy);
+ }
+
// create an intial aiml configuration object
UIAimlConfiguration aiconf = new UIAimlConfiguration();
@@ -275,19 +278,21 @@
String filepath = userFolder.getAbsolutePath() + FILE_SEPARATOR
+ AIML_FOLDER + FILE_SEPARATOR + TEMPLATE_FOLDER
+ FILE_SEPARATOR + USER_TEMPLATE_NAME;
- Document doc = new SAXBuilder().build(filepath);
+// Document doc = new SAXBuilder().build(filepath);
+ Document doc = new Document();
+ doc.setRootElement(new Element("aiml"));
for (AIMLTemplate template : aimlconf.values()) {
if (!template.isPersistet()) {
- if (template.isObsolete()) {
- // delete it
- Element todelete = locateCategoryElementByPattern(doc,
- template.getPattern());
- if (todelete != null) {
- todelete.detach();
- }
-
- }
+// if (template.isObsolete()) {
+// // delete it
+// Element todelete = locateCategoryElementByPattern(doc,
+// template.getPattern());
+// if (todelete != null) {
+// todelete.detach();
+// }
+//
+// }
if (!template.isObsolete()) {
// delete it
Element toupdate = locateCategoryElementByPattern(doc,
@@ -305,16 +310,18 @@
cat.addContent(new Element("template") //.addContent("The result of your query is: ")
.addContent(ext));
ext.setAttribute("param", template.getQuery());
+
doc.getRootElement().addContent(cat);
}
// write it
- new XMLOutputter(Format.getPrettyFormat()).output(doc,
- new FileOutputStream(filepath));
+
change = true;
template.setPersistet(true);
}
}
+ new XMLOutputter(Format.getPrettyFormat()).output(doc,
+ new FileOutputStream(filepath));
} catch (JDOMException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: trunk/xOperator/src/net/sf/xoperator/ui/UIDelegate.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/UIDelegate.java 2008-01-07 22:23:40 UTC (rev 97)
+++ trunk/xOperator/src/net/sf/xoperator/ui/UIDelegate.java 2008-01-11 01:32:32 UTC (rev 98)
@@ -45,6 +45,7 @@
Message message = (Message) context.blackboard().read(new KindOfFilter(Message.class));
//checks if the interactor can handle this
String messageBody = message.getBody().trim();
+
if (this.interact!=null && this.interact.isInteraction(messageBody)) {
Modified: trunk/xOperator/src/net/sf/xoperator/ui/txt/RemoveAimlTemplate.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/ui/txt/RemoveAimlTemplate.java 2008-01-07 22:23:40 UTC (rev 97)
+++ trunk/xOperator/src/net/sf/xoperator/ui/txt/RemoveAimlTemplate.java 2008-01-11 01:32:32 UTC (rev 98)
@@ -30,7 +30,7 @@
@Override
public List<Object> performInternal(String call, NoPlanBlackBoardControl control,
Interactor interactor) {
- String pattern = call.split("\"")[1].toUpperCase();
+ String pattern = call.split(" ")[2].toUpperCase();
Set<?> aimltemps = control.getConfigurationContext().blackboard()
.readAll(new KindOfFilter(AIMLTemplate.class));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2008-01-07 22:24:02
|
Revision: 97
http://xoperator.svn.sourceforge.net/xoperator/?rev=97&view=rev
Author: tomatop
Date: 2008-01-07 14:23:40 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
group agent
Modified Paths:
--------------
trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeObjectBlackboard.java
trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
trunk/xOperator/src/net/sf/xoperator/xmpp/AccountInfo.java
trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
Modified: trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeObjectBlackboard.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeObjectBlackboard.java 2008-01-06 19:19:16 UTC (rev 96)
+++ trunk/xOperator/src/net/sf/xoperator/blackboard/ThreadsafeObjectBlackboard.java 2008-01-07 22:23:40 UTC (rev 97)
@@ -86,7 +86,7 @@
this.notifyEntryAdded(zone, clonedEntry);
} catch (Throwable e) {
this.log.error("Throwable caught: " + e);
- throw new RuntimeException(e);
+ //throw new RuntimeException(e);
}
}
Modified: trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-06 19:19:16 UTC (rev 96)
+++ trunk/xOperator/src/net/sf/xoperator/configuration/SerialisingPersister.java 2008-01-07 22:23:40 UTC (rev 97)
@@ -176,7 +176,7 @@
}
// same with the proxy
- if (proxy.validate()) {
+ if (proxy!=null && proxy.validate()) {
configs.put(AccountInfo.class.getCanonicalName()
+ AccountInfo.PROXY, proxy);
}
Modified: trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-06 19:19:16 UTC (rev 96)
+++ trunk/xOperator/src/net/sf/xoperator/startup/CommandLineMain.java 2008-01-07 22:23:40 UTC (rev 97)
@@ -131,6 +131,22 @@
.withDescription(
"The port of the server to connect to for the roxy account, defaults to 5222")
.create("proxy_port"));
+ options
+ .addOption(OptionBuilder
+ .withArgName("group_agent")
+ .hasArg()
+ .isRequired(false)
+ .withDescription(
+ "if set to to true, no proxy account will be used")
+ .create("group_agent"));
+ options
+ .addOption(OptionBuilder
+ .withArgName("p2penabled")
+ .hasArg()
+ .isRequired(false)
+ .withDescription(
+ "if set to to true, p2p communication is activated")
+ .create("p2penabled"));
}
@@ -144,7 +160,6 @@
CommandLineParser parser = new GnuParser();
AccountInfo main = new AccountInfo();
AccountInfo proxy = new AccountInfo();
- List<RdfStoreInfo> stores = new ArrayList<RdfStoreInfo>();
try {
CommandLine cl = parser.parse(options, args);
@@ -152,14 +167,21 @@
main.setPassword(cl.getOptionValue("main_password"));
main.setServer(cl.getOptionValue("main_server"));
main.setPort(cl.getOptionValue("main_port")!=null?Integer.parseInt(cl.getOptionValue("main_port")):null);
+
+ main.setStandalone(cl.getOptionValue("group_agent")!=null?Boolean.parseBoolean(cl.getOptionValue("group_agent")):false);
+ main.setP2penabled(cl.getOptionValue("p2penabled")!=null?Boolean.getBoolean(cl.getOptionValue("p2penabled")):false);
main.setMainAccount(true);
+ if(main.isStandalone()){
+ proxy=null;
+ }else{
+ proxy.setUsername(cl.getOptionValue("proxy_username"));
+ proxy.setPassword(cl.getOptionValue("proxy_password"));
+ proxy.setServer(cl.getOptionValue("proxy_server"));
+ proxy.setPort(cl.getOptionValue("proxy_port")!=null?Integer.parseInt(cl.getOptionValue("proxy_port")):null);
+ proxy.setMainAccount(false);
+ }
- proxy.setUsername(cl.getOptionValue("proxy_username"));
- proxy.setPassword(cl.getOptionValue("proxy_password"));
- proxy.setServer(cl.getOptionValue("proxy_server"));
- proxy.setPort(cl.getOptionValue("proxy_port")!=null?Integer.parseInt(cl.getOptionValue("proxy_port")):null);
- proxy.setMainAccount(false);
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/AccountInfo.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/AccountInfo.java 2008-01-06 19:19:16 UTC (rev 96)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/AccountInfo.java 2008-01-07 22:23:40 UTC (rev 97)
@@ -27,6 +27,7 @@
*
*/
public class AccountInfo extends PersistentKSConfiguration {
+
public static final String MAIN = "main";
@@ -45,6 +46,26 @@
private boolean mainAccount;
private boolean obsolete;
+
+ private boolean standalone = false;
+
+ private boolean p2penabled = false;
+
+ public void setP2penabled(boolean p2penabled) {
+ this.p2penabled = p2penabled;
+ }
+
+ public boolean isP2penabled() {
+ return p2penabled;
+ }
+
+ public void setStandalone(boolean standalone) {
+ this.standalone = standalone;
+ }
+
+ public boolean isStandalone() {
+ return standalone;
+ }
@Override
public boolean isObsolete() {
Modified: trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java
===================================================================
--- trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-01-06 19:19:16 UTC (rev 96)
+++ trunk/xOperator/src/net/sf/xoperator/xmpp/XMPPManager.java 2008-01-07 22:23:40 UTC (rev 97)
@@ -71,7 +71,14 @@
this.log.error(e);
throw new RuntimeException(e);
}
- registerInterAgentCommunicationListener(mainClient);
+ if(info.isStandalone()){
+ registerChatListeners(mainClient);
+ }
+
+ if(info.isP2penabled()){
+ registerInterAgentCommunicationListener(mainClient);
+ }
+
}
private void logIntoProxy(AccountInfo info) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
