- kune-commits - lists.ourproject.org

r1738 - in trunk: . src/main/java/cc/kune/core/server/init src/main/resources/META-INF
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 22:10:38 +0100 (Mon, 05 Mar 2012) New Revision: 1738 Modified: trunk/INSTALL trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/resources/META-INF/persistence.xml Log: updated INSTALL Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-05 20:19:55 UTC (rev 1737) +++ trunk/INSTALL 2012-03-05 21:10:38 UTC (rev 1738) @@ -142,30 +142,26 @@ Not verified: in Windows you need to do something similar (copy the jmagick .dll of the same version in the Windows directory) -===Run the server for the first time=== +===Initialize the kune database=== -Run the server for the first time and initialize the db: +mysql -p -u kune < script/kune_initialize.sql -I you are installing kuen for development: +And if all goes ok, migrate the database: - bin/server.sh # or mvn exec:java +script/liquibase-migrate.sh -or for production +Windows users should do this by hand or adapt this (simple) script to Windows. - bin/server.sh -j kune.jar # -h for more options +===Run the server=== -Once started for the first time the db is initialized. Then you should stop (Ctrl-C) and start the db migration process: +Run the server for the first time and initialize the db: - ./script/liquibase-migrate.sh +I you are installing kune for development: -=== Normal kune server start (after initialization) === + bin/server.sh # or mvn exec:java -After that, you can start the server using the script: +or for production - bin/server.sh - -or (again) running in production: - bin/server.sh -j kune.jar # -h for more options ===Connecting to the server=== Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 20:19:55 UTC (rev 1737) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 21:10:38 UTC (rev 1738) @@ -176,12 +176,9 @@ } public void initConditional() throws Exception { - final Group dummyGroup = new Group("dummygr", "dummygr"); - groupManager.persist(dummyGroup); if (groupManager.count() == 0) { initialize(); } - groupManager.remove(dummyGroup); translationService.init(); } Modified: trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/src/main/resources/META-INF/persistence.xml 2012-03-05 20:19:55 UTC (rev 1737) +++ trunk/src/main/resources/META-INF/persistence.xml 2012-03-05 21:10:38 UTC (rev 1738) @@ -50,7 +50,7 @@   - <property name="hibernate.hbm2ddl.auto" value="update"/> + <property name="hibernate.hbm2ddl.auto" value="validate"/>  <property name="hibernate.connection.provider_class" value="org.hibernate.connection.C3P0ConnectionProvider"/>

1 0

r1737 - in trunk: script src/main/java/cc/kune/chat/client src/main/java/cc/kune/chat/server src/main/java/cc/kune/core/server/auth src/main/java/cc/kune/core/server/manager/impl src/main/java/cc/kune/core/server/users src/main/java/cc/kune/core/shared/dto
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 21:19:55 +0100 (Mon, 05 Mar 2012) New Revision: 1737 Added: trunk/script/kune_initialize.sql Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java trunk/src/main/java/cc/kune/core/server/auth/SuperAdminMethodInterceptor.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/users/UserInfo.java trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java Log: mysql init Added: trunk/script/kune_initialize.sql =================================================================== --- trunk/script/kune_initialize.sql (rev 0) +++ trunk/script/kune_initialize.sql 2012-03-05 20:19:55 UTC (rev 1737) @@ -0,0 +1,575 @@ +-- MySQL dump 10.13 Distrib 5.1.58, for debian-linux-gnu (x86_64) +-- +-- Host: localhost Database: kune_dev +-- ------------------------------------------------------ +-- Server version 5.1.58-1ubuntu1 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `access_lists` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `access_lists` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `admins_id` bigint(20) DEFAULT NULL, + `editors_id` bigint(20) DEFAULT NULL, + `viewers_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK8BFAE0FA45D900E6` (`editors_id`), + KEY `FK8BFAE0FA522D370B` (`viewers_id`), + KEY `FK8BFAE0FAA3EB21C8` (`admins_id`), + CONSTRAINT `FK8BFAE0FAA3EB21C8` FOREIGN KEY (`admins_id`) REFERENCES `group_list` (`id`), + CONSTRAINT `FK8BFAE0FA45D900E6` FOREIGN KEY (`editors_id`) REFERENCES `group_list` (`id`), + CONSTRAINT `FK8BFAE0FA522D370B` FOREIGN KEY (`viewers_id`) REFERENCES `group_list` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `container_translation` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `container_translation` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `language_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK312BE3F39F03C503` (`language_id`), + CONSTRAINT `FK312BE3F39F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `containers` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `containers` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `deletedOn` datetime DEFAULT NULL, + `name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `toolName` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `typeId` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `accessLists_id` bigint(20) DEFAULT NULL, + `language_id` bigint(20) DEFAULT NULL, + `owner_id` bigint(20) DEFAULT NULL, + `parent_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK8A84412F8E388F` (`accessLists_id`), + KEY `FK8A844125DDFDF26` (`parent_id`), + KEY `FK8A844129F76A8FB` (`owner_id`), + KEY `FK8A844129F03C503` (`language_id`), + CONSTRAINT `FK8A844129F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`), + CONSTRAINT `FK8A844125DDFDF26` FOREIGN KEY (`parent_id`) REFERENCES `containers` (`id`), + CONSTRAINT `FK8A844129F76A8FB` FOREIGN KEY (`owner_id`) REFERENCES `groups` (`id`), + CONSTRAINT `FK8A84412F8E388F` FOREIGN KEY (`accessLists_id`) REFERENCES `access_lists` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `containers_container_translation` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `containers_container_translation` ( + `containers_id` bigint(20) NOT NULL, + `containerTranslations_id` bigint(20) NOT NULL, + UNIQUE KEY `containerTranslations_id` (`containerTranslations_id`), + KEY `FK1BA62F8657C40ABE` (`containers_id`), + KEY `FK1BA62F861FB22672` (`containerTranslations_id`), + CONSTRAINT `FK1BA62F861FB22672` FOREIGN KEY (`containerTranslations_id`) REFERENCES `container_translation` (`id`), + CONSTRAINT `FK1BA62F8657C40ABE` FOREIGN KEY (`containers_id`) REFERENCES `containers` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `content_translations` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `content_translations` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `contentId` bigint(20) DEFAULT NULL, + `language_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FKF10565E89F03C503` (`language_id`), + CONSTRAINT `FKF10565E89F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `contents` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `contents` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `deletedOn` datetime DEFAULT NULL, + `filename` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `mimesubtype` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `mimetype` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `modifiedOn` bigint(20) DEFAULT NULL, + `publishedOn` datetime DEFAULT NULL, + `status` varchar(255) COLLATE utf8_bin NOT NULL, + `typeId` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `version` int(11) DEFAULT NULL, + `waveId` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `accessLists_id` bigint(20) DEFAULT NULL, + `container_id` bigint(20) DEFAULT NULL, + `language_id` bigint(20) NOT NULL, + `lastRevision_id` bigint(20) DEFAULT NULL, + `license_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FKDE2F5B1AF8E388F` (`accessLists_id`), + KEY `FKDE2F5B1AFC54C30F` (`lastRevision_id`), + KEY `FKDE2F5B1A1FE0D12F` (`license_id`), + KEY `FKDE2F5B1A622077EF` (`container_id`), + KEY `FKDE2F5B1A9F03C503` (`language_id`), + CONSTRAINT `FKDE2F5B1A9F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`), + CONSTRAINT `FKDE2F5B1A1FE0D12F` FOREIGN KEY (`license_id`) REFERENCES `licenses` (`id`), + CONSTRAINT `FKDE2F5B1A622077EF` FOREIGN KEY (`container_id`) REFERENCES `containers` (`id`), + CONSTRAINT `FKDE2F5B1AF8E388F` FOREIGN KEY (`accessLists_id`) REFERENCES `access_lists` (`id`), + CONSTRAINT `FKDE2F5B1AFC54C30F` FOREIGN KEY (`lastRevision_id`) REFERENCES `revisions` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `contents_content_translations` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `contents_content_translations` ( + `contents_id` bigint(20) NOT NULL, + `translations_id` bigint(20) NOT NULL, + UNIQUE KEY `translations_id` (`translations_id`), + KEY `FKF5E4F9ED8B538FEE` (`contents_id`), + KEY `FKF5E4F9ED879058DB` (`translations_id`), + CONSTRAINT `FKF5E4F9ED879058DB` FOREIGN KEY (`translations_id`) REFERENCES `content_translations` (`id`), + CONSTRAINT `FKF5E4F9ED8B538FEE` FOREIGN KEY (`contents_id`) REFERENCES `contents` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `contents_kusers` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `contents_kusers` ( + `contents_id` bigint(20) NOT NULL, + `authors_id` bigint(20) NOT NULL, + KEY `FK956FE9428B538FEE` (`contents_id`), + KEY `FK956FE94298059548` (`authors_id`), + CONSTRAINT `FK956FE94298059548` FOREIGN KEY (`authors_id`) REFERENCES `kusers` (`id`), + CONSTRAINT `FK956FE9428B538FEE` FOREIGN KEY (`contents_id`) REFERENCES `contents` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `customproperties` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `customproperties` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `data` longblob, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ext_media_descriptors` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ext_media_descriptors` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `detectRegex` varchar(255) COLLATE utf8_bin NOT NULL, + `embedTemplate` longtext COLLATE utf8_bin NOT NULL, + `height` int(11) NOT NULL, + `idRegex` varchar(255) COLLATE utf8_bin NOT NULL, + `name` varchar(255) COLLATE utf8_bin NOT NULL, + `siteurl` varchar(255) COLLATE utf8_bin NOT NULL, + `width` int(11) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `globalize_countries` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `globalize_countries` ( + `id` bigint(20) NOT NULL, + `code` varchar(2) COLLATE utf8_bin DEFAULT NULL, + `currency_code` varchar(3) COLLATE utf8_bin DEFAULT NULL, + `currency_decimal_sep` varchar(2) COLLATE utf8_bin DEFAULT NULL, + `currency_format` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `date_format` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `decimal_sep` varchar(2) COLLATE utf8_bin DEFAULT NULL, + `english_name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `number_grouping_scheme` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `thousands_sep` varchar(2) COLLATE utf8_bin DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `id` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `globalize_languages` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `globalize_languages` ( + `id` bigint(20) NOT NULL, + `code` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `date_format` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `date_format_short` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `direction` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `english_name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `english_name_locale` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `english_name_modifier` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `iso_639_1` varchar(2) COLLATE utf8_bin DEFAULT NULL, + `iso_639_2` varchar(3) COLLATE utf8_bin DEFAULT NULL, + `iso_639_3` varchar(3) COLLATE utf8_bin DEFAULT NULL, + `macro_language` bit(1) DEFAULT NULL, + `native_name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `native_name_locale` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `native_name_modifier` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `pluralization` varchar(200) COLLATE utf8_bin DEFAULT NULL, + `rfc_3066` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `scope` varchar(1) COLLATE utf8_bin DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `id` (`id`), + UNIQUE KEY `code` (`code`), + UNIQUE KEY `iso_639_2` (`iso_639_2`), + UNIQUE KEY `iso_639_3` (`iso_639_3`), + UNIQUE KEY `rfc_3066` (`rfc_3066`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `globalize_translations` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `globalize_translations` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `facet` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `item_id` int(11) DEFAULT NULL, + `noteForTranslators` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `pluralization_index` int(11) DEFAULT NULL, + `table_name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `text` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `tr_key` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `gtype` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `language_id` bigint(20) DEFAULT NULL, + `parent_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `id` (`id`), + KEY `FKCB245A905E56098` (`parent_id`), + KEY `FKCB245A909F03C503` (`language_id`), + CONSTRAINT `FKCB245A909F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`), + CONSTRAINT `FKCB245A905E56098` FOREIGN KEY (`parent_id`) REFERENCES `globalize_translations` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `group_list` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `group_list` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `mode` varchar(255) COLLATE utf8_bin DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `group_list_groups` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `group_list_groups` ( + `group_list_id` bigint(20) NOT NULL, + `list_id` bigint(20) NOT NULL, + PRIMARY KEY (`group_list_id`,`list_id`), + KEY `FK531B66D5B075E82E` (`group_list_id`), + KEY `FK531B66D5472D9F30` (`list_id`), + CONSTRAINT `FK531B66D5472D9F30` FOREIGN KEY (`list_id`) REFERENCES `groups` (`id`), + CONSTRAINT `FK531B66D5B075E82E` FOREIGN KEY (`group_list_id`) REFERENCES `group_list` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `groups` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `groups` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `admissionType` varchar(255) COLLATE utf8_bin NOT NULL, + `backgroundImage` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `backgroundMime` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `createdOn` bigint(20) NOT NULL, + `groupType` varchar(255) COLLATE utf8_bin NOT NULL, + `logo` longblob, + `mimesubtype` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `mimetype` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `longName` varchar(50) COLLATE utf8_bin NOT NULL, + `shortName` varchar(15) COLLATE utf8_bin DEFAULT NULL, + `workspaceTheme` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `defaultContent_id` bigint(20) DEFAULT NULL, + `defaultLicense_id` bigint(20) DEFAULT NULL, + `socialNetwork_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `longName` (`longName`), + UNIQUE KEY `shortName` (`shortName`), + KEY `FKB63DD9D44E0DFF30` (`defaultContent_id`), + KEY `FKB63DD9D43EC9394F` (`socialNetwork_id`), + KEY `FKB63DD9D4BBB28A30` (`defaultLicense_id`), + CONSTRAINT `FKB63DD9D4BBB28A30` FOREIGN KEY (`defaultLicense_id`) REFERENCES `licenses` (`id`), + CONSTRAINT `FKB63DD9D43EC9394F` FOREIGN KEY (`socialNetwork_id`) REFERENCES `social_networks` (`id`), + CONSTRAINT `FKB63DD9D44E0DFF30` FOREIGN KEY (`defaultContent_id`) REFERENCES `contents` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `groups_tool_configurations` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `groups_tool_configurations` ( + `groups_id` bigint(20) NOT NULL, + `toolsConfig_id` bigint(20) NOT NULL, + `mapkey` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '', + PRIMARY KEY (`groups_id`,`mapkey`), + UNIQUE KEY `toolsConfig_id` (`toolsConfig_id`), + KEY `FK1CDF00D9E3FE623A` (`groups_id`), + KEY `FK1CDF00D94B11FAD0` (`toolsConfig_id`), + CONSTRAINT `FK1CDF00D94B11FAD0` FOREIGN KEY (`toolsConfig_id`) REFERENCES `tool_configurations` (`id`), + CONSTRAINT `FK1CDF00D9E3FE623A` FOREIGN KEY (`groups_id`) REFERENCES `groups` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `kusers` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `kusers` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `diggest` longblob NOT NULL, + `email` varchar(255) COLLATE utf8_bin NOT NULL, + `emailCheckDate` bigint(20) DEFAULT NULL, + `emailConfirmHash` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `emailNotifFreq` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `emailVerified` bit(1) DEFAULT NULL, + `lastLogin` bigint(20) DEFAULT NULL, + `name` varchar(50) COLLATE utf8_bin NOT NULL, + `password` varchar(40) COLLATE utf8_bin NOT NULL, + `sNetVisibility` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `salt` longblob NOT NULL, + `shortName` varchar(15) COLLATE utf8_bin DEFAULT NULL, + `timezone` varchar(255) COLLATE utf8_bin NOT NULL, + `country_id` bigint(20) NOT NULL, + `language_id` bigint(20) NOT NULL, + `userGroup_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `email` (`email`), + UNIQUE KEY `name` (`name`), + UNIQUE KEY `emailConfirmHash` (`emailConfirmHash`), + UNIQUE KEY `shortName` (`shortName`), + KEY `FKBD3D187D28E3727A` (`userGroup_id`), + KEY `FKBD3D187D61C72291` (`country_id`), + KEY `FKBD3D187D9F03C503` (`language_id`), + CONSTRAINT `FKBD3D187D9F03C503` FOREIGN KEY (`language_id`) REFERENCES `globalize_languages` (`id`), + CONSTRAINT `FKBD3D187D28E3727A` FOREIGN KEY (`userGroup_id`) REFERENCES `groups` (`id`), + CONSTRAINT `FKBD3D187D61C72291` FOREIGN KEY (`country_id`) REFERENCES `globalize_countries` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `licenses` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `licenses` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `description` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `imageUrl` varchar(255) COLLATE utf8_bin NOT NULL, + `isCC` bit(1) NOT NULL, + `isCopyleft` bit(1) NOT NULL, + `isDeprecated` bit(1) NOT NULL, + `longName` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `rdf` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `shortName` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `url` varchar(255) COLLATE utf8_bin NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `longName` (`longName`), + UNIQUE KEY `shortName` (`shortName`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `rates` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `rates` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `value` double DEFAULT NULL, + `content_id` bigint(20) DEFAULT NULL, + `rater_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `content_id` (`content_id`,`rater_id`), + KEY `FK6744F93B23C462F` (`content_id`), + KEY `FK6744F93AAD99BE` (`rater_id`), + CONSTRAINT `FK6744F93AAD99BE` FOREIGN KEY (`rater_id`) REFERENCES `kusers` (`id`), + CONSTRAINT `FK6744F93B23C462F` FOREIGN KEY (`content_id`) REFERENCES `contents` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `revisions` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `revisions` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `body` longtext COLLATE utf8_bin, + `createdOn` bigint(20) NOT NULL, + `title` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `version` int(11) NOT NULL, + `content_id` bigint(20) DEFAULT NULL, + `editor_id` bigint(20) DEFAULT NULL, + `previous_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK1E2243F8B23C462F` (`content_id`), + KEY `FK1E2243F882CA86C9` (`previous_id`), + KEY `FK1E2243F8831BB603` (`editor_id`), + CONSTRAINT `FK1E2243F8831BB603` FOREIGN KEY (`editor_id`) REFERENCES `kusers` (`id`), + CONSTRAINT `FK1E2243F882CA86C9` FOREIGN KEY (`previous_id`) REFERENCES `revisions` (`id`), + CONSTRAINT `FK1E2243F8B23C462F` FOREIGN KEY (`content_id`) REFERENCES `contents` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `social_networks` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `social_networks` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `visibility` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `accessLists_id` bigint(20) DEFAULT NULL, + `pendingCollaborators_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK7E961097F8E388F` (`accessLists_id`), + KEY `FK7E96109764FC5696` (`pendingCollaborators_id`), + CONSTRAINT `FK7E96109764FC5696` FOREIGN KEY (`pendingCollaborators_id`) REFERENCES `group_list` (`id`), + CONSTRAINT `FK7E961097F8E388F` FOREIGN KEY (`accessLists_id`) REFERENCES `access_lists` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `tag_user_content` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `tag_user_content` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `content_id` bigint(20) NOT NULL, + `tag_id` bigint(20) NOT NULL, + `user_id` bigint(20) NOT NULL, + PRIMARY KEY (`id`), + KEY `FK38BE208AB23C462F` (`content_id`), + KEY `FK38BE208AE8AF66E5` (`user_id`), + KEY `FK38BE208A4F22390F` (`tag_id`), + CONSTRAINT `FK38BE208A4F22390F` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`), + CONSTRAINT `FK38BE208AB23C462F` FOREIGN KEY (`content_id`) REFERENCES `contents` (`id`), + CONSTRAINT `FK38BE208AE8AF66E5` FOREIGN KEY (`user_id`) REFERENCES `kusers` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `tags` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `tags` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `createdOn` bigint(20) NOT NULL, + `name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `tool_configurations` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `tool_configurations` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `enabled` bit(1) NOT NULL, + `root_id` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FKDB4DCBC434BBDBEE` (`root_id`), + CONSTRAINT `FKDB4DCBC434BBDBEE` FOREIGN KEY (`root_id`) REFERENCES `containers` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2012-03-05 21:18:23 Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -45,8 +45,8 @@ import cc.kune.core.client.events.AvatarChangedEvent; import cc.kune.core.client.events.NewUserRegisteredEvent; import cc.kune.core.client.events.UserSignInEvent; +import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.events.UserSignOutEvent; -import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.events.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.services.ClientFileDownloadUtils; @@ -299,14 +299,14 @@ @Override public void doLogin() { assert session.getCurrentUserInfo() != null; - doLogin(session.getCurrentUserInfo()); + doLogin(session.getCurrentUserInfo(), session.getUserHash()); } - private void doLogin(final UserInfoDTO user) { + private void doLogin(final UserInfoDTO user, final String token) { createActionIfNeeded(); createDialogIfNeeded(); chatOptions.username = user.getChatName(); - chatOptions.passwd = user.getChatPassword(); + chatOptions.passwd = token; chatOptions.resource = "emite-" + new Date().getTime() + "-kune"; chatOptions.useruri = XmppURI.uri(chatOptions.username, chatOptions.domain, chatOptions.resource); createActionIfNeeded(); Modified: trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -55,7 +55,7 @@ final String roomName, final String subject) { final String groupShortName = parentToken.getGroup(); final String userShortName = user.getShortName(); - final ChatConnection connection = xmppManager.login(userShortName, user.getPassword(), userHash); + final ChatConnection connection = xmppManager.login(userShortName, userHash, userHash); if (!xmppManager.existRoom(connection, roomName)) { xmppManager.createRoom(connection, roomName, userShortName + userHash, subject); xmppManager.disconnect(connection); Modified: trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -58,10 +58,12 @@ @Override public Group initGroup(final User user, final Group group, final Object... otherVars) { + @SuppressWarnings("unused") final Container rootFolder = createRoot(group); - final String groupShortName = group.getShortName(); - chatManager.addRoom("none", user, rootFolder.getStateToken(), groupShortName, - i18n.t("Welcome to the [%s] public chat room", groupShortName)); + // final String groupShortName = group.getShortName(); + // chatManager.addRoom("FIXME", user, rootFolder.getStateToken(), + // groupShortName, + // i18n.t("Welcome to the [%s] public chat room", groupShortName)); return group; } Modified: trunk/src/main/java/cc/kune/core/server/auth/SuperAdminMethodInterceptor.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/SuperAdminMethodInterceptor.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/server/auth/SuperAdminMethodInterceptor.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -72,6 +72,8 @@ siteGroup = groupFinder.get().findByShortName( kuneProperties.get().get(KuneProperties.DEFAULT_SITE_SHORT_NAME)); } + LOG.info(String.format("SuperAuth for group: %s", siteGroup.getShortName())); + LOG.info(String.format("Auth rol required: %s", rol.toString())); if (userHash == null) { throw new UserMustBeLoggedException(); @@ -81,6 +83,8 @@ } else { final User user = userSessionManager.getUser(); if (!AccessRightsUtils.correctMember(user, siteGroup, rol)) { + LOG.info(String.format("Don't have rights for do that. User: %s, not %s member of %s", + user.getShortName(), rol, siteGroup.getShortName())); throw new AccessViolationException(); } } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -324,7 +324,6 @@ } @Override - @Deprecated public UserBuddiesData getUserBuddies(final String shortName) { // XEP-133 get roster by admin part is not implemented in openfire // also access to the openfire db is not easy with hibernate (the use of Modified: trunk/src/main/java/cc/kune/core/server/users/UserInfo.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/users/UserInfo.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/server/users/UserInfo.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -29,7 +29,6 @@ public class UserInfo { private String chatName; - private String chatPassword; private List<String> enabledTools; private Set<Group> groupsIsAdmin; private Set<Group> groupsIsCollab; @@ -43,10 +42,6 @@ return chatName; } - public String getChatPassword() { - return chatPassword; - } - public I18nCountry getCountry() { return user.getCountry(); } @@ -99,11 +94,6 @@ this.chatName = chatName; } - @Deprecated - public void setChatPassword(final String chatPassword) { - this.chatPassword = chatPassword; - } - public void setEnabledTools(final List<String> enabledTools) { this.enabledTools = enabledTools; } Modified: trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/server/users/UserInfoServiceDefault.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -19,7 +19,6 @@ */ package cc.kune.core.server.users; - import cc.kune.core.client.errors.DefaultException; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.SocialNetworkManager; @@ -34,40 +33,39 @@ @Singleton public class UserInfoServiceDefault implements UserInfoService { - private final GroupManager groupManager; - private final SocialNetworkManager socialNetworkManager; + private final GroupManager groupManager; + private final SocialNetworkManager socialNetworkManager; - @Inject - public UserInfoServiceDefault(final SocialNetworkManager socialNetwork, final GroupManager groupManager) { - this.socialNetworkManager = socialNetwork; - this.groupManager = groupManager; - } + @Inject + public UserInfoServiceDefault(final SocialNetworkManager socialNetwork, final GroupManager groupManager) { + this.socialNetworkManager = socialNetwork; + this.groupManager = groupManager; + } - @Override - public UserInfo buildInfo(final User user, final String userHash) throws DefaultException { - UserInfo userInfo = null; - if (User.isKnownUser(user)) { - userInfo = new UserInfo(); + @Override + public UserInfo buildInfo(final User user, final String userHash) throws DefaultException { + UserInfo userInfo = null; + if (User.isKnownUser(user)) { + userInfo = new UserInfo(); - userInfo.setUser(user); - userInfo.setChatName(user.getShortName()); - userInfo.setChatPassword(user.getPassword()); - userInfo.setUserHash(userHash); - // FIXME: save this in user properties - userInfo.setShowDeletedContent(false); + userInfo.setUser(user); + userInfo.setChatName(user.getShortName()); + userInfo.setUserHash(userHash); + // FIXME: save this in user properties + userInfo.setShowDeletedContent(false); - final Group userGroup = user.getUserGroup(); + final Group userGroup = user.getUserGroup(); - final ParticipationData participation = socialNetworkManager.findParticipation(user, userGroup); - userInfo.setGroupsIsAdmin(participation.getGroupsIsAdmin()); - userInfo.setGroupsIsCollab(participation.getGroupsIsCollab()); - userInfo.setEnabledTools(groupManager.findEnabledTools(userGroup.getId())); - final Content defaultContent = userGroup.getDefaultContent(); - userInfo.setUserGroup(userGroup); - if (defaultContent != null) { - userInfo.setHomePage(defaultContent.getStateToken().toString()); - } - } - return userInfo; + final ParticipationData participation = socialNetworkManager.findParticipation(user, userGroup); + userInfo.setGroupsIsAdmin(participation.getGroupsIsAdmin()); + userInfo.setGroupsIsCollab(participation.getGroupsIsCollab()); + userInfo.setEnabledTools(groupManager.findEnabledTools(userGroup.getId())); + final Content defaultContent = userGroup.getDefaultContent(); + userInfo.setUserGroup(userGroup); + if (defaultContent != null) { + userInfo.setHomePage(defaultContent.getStateToken().toString()); + } } + return userInfo; + } } Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -26,7 +26,6 @@ public class UserInfoDTO implements IsSerializable { private String chatName; - private String chatPassword; private List<String> enabledTools; private Set<GroupDTO> groupsIsAdmin; private Set<GroupDTO> groupsIsCollab; @@ -40,11 +39,6 @@ return chatName; } - @Deprecated - public String getChatPassword() { - return chatPassword; - } - public I18nCountryDTO getCountry() { return user.getCountry(); } @@ -97,12 +91,6 @@ this.chatName = chatName; } - @Deprecated - public void setChatPassword(final String password) { - this.chatPassword = password; - - } - public void setEnabledTools(final List<String> enabledTools) { this.enabledTools = enabledTools; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2012-03-05 19:50:32 UTC (rev 1736) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2012-03-05 20:19:55 UTC (rev 1737) @@ -47,7 +47,6 @@ this.language = language; this.country = country; this.timezone = timezone; - } @Override

1 0

r1736 - trunk/src/main/java/cc/kune/core/server/init
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 20:50:32 +0100 (Mon, 05 Mar 2012) New Revision: 1736 Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java Log: Trying to find W$ initialize problem Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 19:24:00 UTC (rev 1735) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 19:50:32 UTC (rev 1736) @@ -176,9 +176,12 @@ } public void initConditional() throws Exception { + final Group dummyGroup = new Group("dummygr", "dummygr"); + groupManager.persist(dummyGroup); if (groupManager.count() == 0) { initialize(); } + groupManager.remove(dummyGroup); translationService.init(); }

1 0

r1735 - in trunk: . src/main/java/cc/kune/core/server/auth/openfire src/main/java/cc/kune/core/server/init src/main/java/cc/kune/core/server/manager src/main/java/cc/kune/core/server/manager/impl src/main/resources src/test/java/cc/kune/core/server/auth/openfire
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 20:24:00 +0100 (Mon, 05 Mar 2012) New Revision: 1735 Added: trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java.txt trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt Removed: trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/resources/wave-server-testing.properties Log: Trying to find W$ initialize problem Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/.classpath 2012-03-05 19:24:00 UTC (rev 1735) @@ -121,7 +121,6 @@ <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/igniterealtime/openfire/3.7.0/openfire-3.7.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.12/proto-msg-0.3.12.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/pom.xml 2012-03-05 19:24:00 UTC (rev 1735) @@ -712,18 +712,43 @@ <version>1.0.2</version> </dependency>  - <dependency> - <groupId>org.igniterealtime</groupId> - <artifactId>openfire</artifactId> - <version>3.7.0</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> -  - </exclusion> - </exclusions> - </dependency> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + </dependencies>   Deleted: trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -1,129 +0,0 @@ -package cc.kune.core.server.auth.openfire; - -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.ObjectInputStream; - -import org.jivesoftware.openfire.auth.AuthProvider; -import org.jivesoftware.openfire.auth.ConnectionException; -import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; -import org.jivesoftware.openfire.auth.UnauthorizedException; -import org.jivesoftware.openfire.user.UserNotFoundException; -import org.waveprotocol.wave.model.wave.ParticipantId; - -public class KuneAuthProvider implements AuthProvider { - - protected class ClassLoadingObjectInputStream extends ObjectInputStream { - - /** - * Code copied from HashSessionManager - * - * @throws IOException - */ - public ClassLoadingObjectInputStream() throws IOException { - super(); - } - - public ClassLoadingObjectInputStream(final java.io.InputStream in) throws IOException { - super(in); - } - - @Override - public Class<?> resolveClass(final java.io.ObjectStreamClass cl) throws IOException, - ClassNotFoundException { - try { - return Class.forName(cl.getName(), false, Thread.currentThread().getContextClassLoader()); - } catch (final ClassNotFoundException e) { - return super.resolveClass(cl); - } - } - } - - private static final String USER_NOT_LOGGED = "User not logged"; - - @SuppressWarnings("unused") - @Override - public void authenticate(final String username, final String token) throws UnauthorizedException, - ConnectionException, InternalUnauthenticatedException { - try { - final File session = new File("/var/lib/kune/_sessions/" + token); - boolean logged = false; - if (session.exists()) { - final FileInputStream is = new FileInputStream(session); - final DataInputStream in = new DataInputStream(is); - - final String clusterId = in.readUTF(); - in.readUTF(); // nodeId - final long created = in.readLong(); - final long accessed = in.readLong(); - final int requests = in.readInt(); - - final int size = in.readInt(); - if (size > 0) { - final ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(in); - for (int i = 0; i < size; i++) { - final String key = ois.readUTF(); - final Object value = ois.readObject(); - if (value instanceof ParticipantId) { - if (((ParticipantId) value).getAddress().startsWith(username + "@")) { - logged = true; - break; - } - } - } - ois.close(); - } - in.close(); - is.close(); - if (!logged) { - throw new UnauthorizedException("Incorrect username"); - } - } else { - throw new UnauthorizedException(USER_NOT_LOGGED); - } - } catch (final FileNotFoundException e) { - throw new UnauthorizedException(USER_NOT_LOGGED, e); - } catch (final IOException e) { - throw new UnauthorizedException(USER_NOT_LOGGED, e); - } catch (final ClassNotFoundException e) { - throw new UnauthorizedException(USER_NOT_LOGGED, e); - } - } - - @Override - public void authenticate(final String username, final String token, final String digest) - throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException { - throw new UnsupportedOperationException(); - } - - @Override - public String getPassword(final String arg0) throws UserNotFoundException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isDigestSupported() { - return false; - } - - @Override - public boolean isPlainSupported() { - return true; - } - - @Override - public void setPassword(final String arg0, final String arg1) throws UserNotFoundException, - UnsupportedOperationException { - throw new UnsupportedOperationException(); - } - - @Override - public boolean supportsPasswordRetrieval() { - return false; - } - -} Copied: trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java.txt (from rev 1732, trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java) =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java.txt (rev 0) +++ trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java.txt 2012-03-05 19:24:00 UTC (rev 1735) @@ -0,0 +1,129 @@ +package cc.kune.core.server.auth.openfire; + +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.ObjectInputStream; + +import org.jivesoftware.openfire.auth.AuthProvider; +import org.jivesoftware.openfire.auth.ConnectionException; +import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; +import org.jivesoftware.openfire.auth.UnauthorizedException; +import org.jivesoftware.openfire.user.UserNotFoundException; +import org.waveprotocol.wave.model.wave.ParticipantId; + +public class KuneAuthProvider implements AuthProvider { + + protected class ClassLoadingObjectInputStream extends ObjectInputStream { + + /** + * Code copied from HashSessionManager + * + * @throws IOException + */ + public ClassLoadingObjectInputStream() throws IOException { + super(); + } + + public ClassLoadingObjectInputStream(final java.io.InputStream in) throws IOException { + super(in); + } + + @Override + public Class<?> resolveClass(final java.io.ObjectStreamClass cl) throws IOException, + ClassNotFoundException { + try { + return Class.forName(cl.getName(), false, Thread.currentThread().getContextClassLoader()); + } catch (final ClassNotFoundException e) { + return super.resolveClass(cl); + } + } + } + + private static final String USER_NOT_LOGGED = "User not logged"; + + @SuppressWarnings("unused") + @Override + public void authenticate(final String username, final String token) throws UnauthorizedException, + ConnectionException, InternalUnauthenticatedException { + try { + final File session = new File("/var/lib/kune/_sessions/" + token); + boolean logged = false; + if (session.exists()) { + final FileInputStream is = new FileInputStream(session); + final DataInputStream in = new DataInputStream(is); + + final String clusterId = in.readUTF(); + in.readUTF(); // nodeId + final long created = in.readLong(); + final long accessed = in.readLong(); + final int requests = in.readInt(); + + final int size = in.readInt(); + if (size > 0) { + final ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(in); + for (int i = 0; i < size; i++) { + final String key = ois.readUTF(); + final Object value = ois.readObject(); + if (value instanceof ParticipantId) { + if (((ParticipantId) value).getAddress().startsWith(username + "@")) { + logged = true; + break; + } + } + } + ois.close(); + } + in.close(); + is.close(); + if (!logged) { + throw new UnauthorizedException("Incorrect username"); + } + } else { + throw new UnauthorizedException(USER_NOT_LOGGED); + } + } catch (final FileNotFoundException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } catch (final IOException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } catch (final ClassNotFoundException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } + } + + @Override + public void authenticate(final String username, final String token, final String digest) + throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException { + throw new UnsupportedOperationException(); + } + + @Override + public String getPassword(final String arg0) throws UserNotFoundException, + UnsupportedOperationException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDigestSupported() { + return false; + } + + @Override + public boolean isPlainSupported() { + return true; + } + + @Override + public void setPassword(final String arg0, final String arg1) throws UserNotFoundException, + UnsupportedOperationException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean supportsPasswordRetrieval() { + return false; + } + +} Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -21,11 +21,8 @@ import java.util.TimeZone; -import javax.persistence.NoResultException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.exception.SQLGrammarException; import org.waveprotocol.box.server.authentication.PasswordDigest; import cc.kune.core.client.errors.UserMustBeLoggedException; @@ -178,44 +175,9 @@ translationManager.persist(test); } - private void createProperties() { - // final PropertyGroup groupProps = new PropertyGroup(Group.PROPS_ID); - // final PropertyGroup userProps = new PropertyGroup(User.PROPS_ID); - // propGroupManager.persist(userProps); - // propGroupManager.persist(groupProps); - // final PropertySubgroup userXmppProps = new - // PropertySubgroup("user-xmpp"); - // propSubgroupManager.persist(userXmppProps); - - // final Property colorProp = new Property("xmpp_color", - // "Choose your color", Property.Type.STRING, true, "blue", - // userProps, userXmppProps); - // final ArrayList<String> subValues = new ArrayList<String>(); - // subValues.add(SubscriptionMode.autoAcceptAll.toString()); - // subValues.add(SubscriptionMode.autoRejectAll.toString()); - // subValues.add(SubscriptionMode.manual.toString()); - // final Property subProp = new Property("xmpp_subcriptionmode", - // "New buddies options", Property.Type.ENUM, true, - // SubscriptionMode.manual.toString(), subValues, userProps, - // userXmppProps); - // final Property unanavProp = new - // Property("xmpp_unanavailableitemsvisible", - // "Show unavailable buddies", - // Property.Type.BOOL, true, Boolean.toString(true), userProps, - // userXmppProps); - // propertyManager.persist(colorProp); - // propertyManager.persist(subProp); - // propertyManager.persist(unanavProp); - } - public void initConditional() throws Exception { - try { - groupManager.getSiteDefaultGroup(); - } catch (final NoResultException e) { + if (groupManager.count() == 0) { initialize(); - } catch (final SQLGrammarException e3) { - // Seems like in Windows we get this Exception instead - initialize(); } translationService.init(); } @@ -224,7 +186,6 @@ public void initDatabase() throws Exception { createOthers(); createLicenses(); - createProperties(); createDefUsersGroup(); } Modified: trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -43,6 +43,14 @@ void clearGroupBackImage(Group group); + /** + * Count # of registered groups (only used to see in the database is + * initialized) + * + * @return the int + */ + int count(); + Group createGroup(Group group, User user, String publicDescrip) throws GroupShortNameInUseException, UserMustBeLoggedException; Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -157,4 +157,12 @@ return search(query, firstResult, maxResults); } + @SuppressWarnings("unchecked") + public int size() { + final FullTextEntityManager fullTextEm = Search.getFullTextEntityManager(getEntityManager()); + final List<T> entities = fullTextEm.createQuery( + "SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); + return entities.size(); + } + } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -144,6 +144,11 @@ } @Override + public int count() { + return super.size(); + } + + @Override public Group createGroup(final Group group, final User user, final String publicDescrip) throws GroupShortNameInUseException, GroupLongNameInUseException, UserMustBeLoggedException { checkIfShortNameAreInUse(group.getShortName()); Modified: trunk/src/main/resources/wave-server-testing.properties =================================================================== --- trunk/src/main/resources/wave-server-testing.properties 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/main/resources/wave-server-testing.properties 2012-03-05 19:24:00 UTC (rev 1735) @@ -68,7 +68,7 @@ # To become an admin: Register a user and set its address as the value below. # Admin has a privilege to change passwords of other users using an agent robot. # Default value: @${wave_server_domain} -admin_user = @local.net +admin_user = @localhost # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). # If filled in then a copy of this wave (actually only the root blip) will be Deleted: trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java 2012-03-05 17:13:05 UTC (rev 1734) +++ trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java 2012-03-05 19:24:00 UTC (rev 1735) @@ -1,18 +0,0 @@ -package cc.kune.core.server.auth.openfire; - -import org.jivesoftware.openfire.auth.ConnectionException; -import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; -import org.jivesoftware.openfire.auth.UnauthorizedException; -import org.junit.Ignore; -import org.junit.Test; - -public class KuneAuthProviderTest { - - @Test - @Ignore - public void maintest() throws UnauthorizedException, ConnectionException, - InternalUnauthenticatedException { - final KuneAuthProvider auth = new KuneAuthProvider(); - auth.authenticate("admin", "169le0ik2rma81xhj4560ul7fm"); - } -} Copied: trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt (from rev 1732, trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt (rev 0) +++ trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt 2012-03-05 19:24:00 UTC (rev 1735) @@ -0,0 +1,18 @@ +package cc.kune.core.server.auth.openfire; + +import org.jivesoftware.openfire.auth.ConnectionException; +import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; +import org.jivesoftware.openfire.auth.UnauthorizedException; +import org.junit.Ignore; +import org.junit.Test; + +public class KuneAuthProviderTest { + + @Test + @Ignore + public void maintest() throws UnauthorizedException, ConnectionException, + InternalUnauthenticatedException { + final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "169le0ik2rma81xhj4560ul7fm"); + } +}

1 0

r1734 - trunk
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 18:13:05 +0100 (Mon, 05 Mar 2012) New Revision: 1734 Modified: trunk/INSTALL Log: Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-05 17:11:43 UTC (rev 1733) +++ trunk/INSTALL 2012-03-05 17:13:05 UTC (rev 1734) @@ -71,7 +71,7 @@ Be sure that the domain you want to use with kune resolv correctly: dig example.org -For development we recommend to use some domain with zone like local.net (add to you /etc/hosts if it's not yet there). If you want to use another different domain from local.net, you have to update src/main/resources/kune.properties and src/main/resources/wave-server* +For development we recommend to use some local domain like localhost, but better with zone like local.net (add to you /etc/hosts if it's not yet there). If you want to use another different domain from localhost, you have to update src/main/resources/kune.properties and src/main/resources/wave-server* and ws.html ===Source code (if you are installing Kune for development)===

1 0

r1733 - in trunk: . docs src/main/resources src/main/webapp
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 18:11:43 +0100 (Mon, 05 Mar 2012) New Revision: 1733 Added: trunk/CHANGING_DOMAIN_DOES_NOT_WORK Removed: trunk/CHANGING_DOMAIN Modified: trunk/docs/fst-2012.svg trunk/docs/mlab-2012.svg trunk/src/main/resources/kune.properties trunk/src/main/resources/wave-server-production.properties trunk/src/main/resources/wave-server.properties trunk/src/main/webapp/ws.html Log: Comming back to localhost Deleted: trunk/CHANGING_DOMAIN =================================================================== --- trunk/CHANGING_DOMAIN 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/CHANGING_DOMAIN 2012-03-05 17:11:43 UTC (rev 1733) @@ -1,42 +0,0 @@ -=CHANGING THE DOMAIN OF A KUNE SERVER= - -Suppose that we want to change from domain.old to domain.new in a kune server deployment. - -==Prerrequisites== - -* Make a backup of /var/lib/kune/, your db and any other location for wave info (_accounts, _deltas, etc) -* Be sure that domain.new can be resolved correctly ($ dig domain.new), also the SRV records (see INSTALL) -* stop kune - -==Do the job== - -===Update configurations and stores=== -* in _accounts, _deltas - -for i in `grep -ril domain.old /var/lib/kune/_accounts`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done -for i in `grep -ril domain.old /var/lib/kune/_deltas`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done - -perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/kune.properties # or in /etc/kune -perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/wave-server.properties # or in /etc/kune -perl -p -i -e 's/domain.old/domain.new/g' src/main/webapp/ws.html -or in production -perl -p -i -e 's/domain.old/domain.new/g' /var/www/kune/ws.html - -rename 's/domain.old/domain.new/g' /var/lib/kune/_accounts - -Remove old persisted sessions: -rm /var/lib/kune/_sessions/* - -===Update the openfire configuration=== -Update your new domain in: -Server > Server Manager > Edit Server Properties -Restart the openfire server - /etc/init.d/openfire restart - -===Update your SMTP configuration (and MX record) === -So emails like someone(a)domain.new are propertly sended. - -===Certificates=== -Update your ssl certificates (openfire, wave keystore, wave federation, etc), if you have configured before with domain.old - -Restart kune and check if all it's ok. Added: trunk/CHANGING_DOMAIN_DOES_NOT_WORK =================================================================== --- trunk/CHANGING_DOMAIN_DOES_NOT_WORK (rev 0) +++ trunk/CHANGING_DOMAIN_DOES_NOT_WORK 2012-03-05 17:11:43 UTC (rev 1733) @@ -0,0 +1,42 @@ +=CHANGING THE DOMAIN OF A KUNE SERVER= + +Suppose that we want to change from domain.old to domain.new in a kune server deployment. + +==Prerrequisites== + +* Make a backup of /var/lib/kune/, your db and any other location for wave info (_accounts, _deltas, etc) +* Be sure that domain.new can be resolved correctly ($ dig domain.new), also the SRV records (see INSTALL) +* stop kune + +==Do the job== + +===Update configurations and stores=== +* in _accounts, _deltas + +for i in `grep -ril domain.old /var/lib/kune/_accounts`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done +for i in `grep -ril domain.old /var/lib/kune/_deltas`; do perl -p -i -e 's/domain.old/domain.new/g' $i ; done + +perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/kune.properties # or in /etc/kune +perl -p -i -e 's/domain.old/domain.new/g' src/main/resources/wave-server.properties # or in /etc/kune +perl -p -i -e 's/domain.old/domain.new/g' src/main/webapp/ws.html +or in production +perl -p -i -e 's/domain.old/domain.new/g' /var/www/kune/ws.html + +rename 's/domain.old/domain.new/g' /var/lib/kune/_accounts/* + +Remove old persisted sessions: +rm /var/lib/kune/_sessions/* + +===Update the openfire configuration=== +Update your new domain in: +Server > Server Manager > Edit Server Properties +Restart the openfire server + /etc/init.d/openfire restart + +===Update your SMTP configuration (and MX record) === +So emails like someone(a)domain.new are propertly sended. + +===Certificates=== +Update your ssl certificates (openfire, wave keystore, wave federation, etc), if you have configured before with domain.old + +Restart kune and check if all it's ok. Modified: trunk/docs/fst-2012.svg =================================================================== --- trunk/docs/fst-2012.svg 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/docs/fst-2012.svg 2012-03-05 17:11:43 UTC (rev 1733) @@ -37,6 +37,10 @@ inkscape:window-maximized="0" inkscape:showpageshadow="false" showborder="true" /> + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> <defs id="defs4"><linearGradient x1="203.47221" Modified: trunk/docs/mlab-2012.svg =================================================================== --- trunk/docs/mlab-2012.svg 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/docs/mlab-2012.svg 2012-03-05 17:11:43 UTC (rev 1733) @@ -37,6 +37,10 @@ inkscape:window-maximized="0" inkscape:showpageshadow="false" showborder="true" /> + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> <defs id="defs4"><linearGradient x1="203.47221" Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/src/main/resources/kune.properties 2012-03-05 17:11:43 UTC (rev 1733) @@ -3,7 +3,7 @@ ### general site config # Your site url. Please end with a slash -kune.siteurl = http://local.net:8080/ +kune.siteurl = http://localhost:8080/ kune.sitelogourl = ws/images/kune-logo-16px.png kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png @@ -23,8 +23,8 @@ ### Email -kune.site.smtp.host = local.net -kune.site.smtp.defaultfrom = noreply(a)local.net +kune.site.smtp.host = localhost +kune.site.smtp.defaultfrom = noreply@localhost # If we should avoid the use of smtp (use only for avoid emails during development) kune.site.smtp.skip = false # This file will we the html used to send emails to users. @@ -57,12 +57,12 @@ kune.admin.name = Site Administrator kune.admin.shortName = admin -kune.admin.email = admin(a)local.net.localdomain +kune.admin.email = admin(a)localhost.localdomain kune.admin.password = easyeasy kune.chat.httpbase = /http-bind/ -kune.chat.domain = local.net -kune.chat.roomHost = rooms.local.net +kune.chat.domain = localhost +kune.chat.roomHost = rooms.localhost ### Feedback system kune.feedback.enabled = true @@ -100,7 +100,7 @@ kune.client.useContentCache = false -kune.publispace.toolicon.visible = false +kune.publispace.toolicon.visible = true # SVG Tutorials # The languages in with the /tutorials/ are translated into Modified: trunk/src/main/resources/wave-server-production.properties =================================================================== --- trunk/src/main/resources/wave-server-production.properties 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/src/main/resources/wave-server-production.properties 2012-03-05 17:11:43 UTC (rev 1733) @@ -68,7 +68,7 @@ # To become an admin: Register a user and set its address as the value below. # Admin has a privilege to change passwords of other users using an agent robot. # Default value: @${wave_server_domain} -admin_user = @local.net +admin_user = @localhost # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). # If filled in then a copy of this wave (actually only the root blip) will be Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/src/main/resources/wave-server.properties 2012-03-05 17:11:43 UTC (rev 1733) @@ -3,12 +3,12 @@ # Domain name of the wave server # Default value: local.net (without .domain zone some things will be broken) -wave_server_domain = local.net +wave_server_domain = localhost # A comma separated list of address on which to listen for connections. # Each address is a comma separated host:port pair. -# Default value: local.net:9898 -http_frontend_public_address = local.net:8888 +# Default value: localhost:9898 +http_frontend_public_address = localhost:8888 # Default value: values passed to http_frontend_public_address. http_frontend_addresses = ${http_frontend_public_address} @@ -68,7 +68,7 @@ # To become an admin: Register a user and set its address as the value below. # Admin has a privilege to change passwords of other users using an agent robot. # Default value: @${wave_server_domain} -admin_user = @local.net +admin_user = @localhost # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). # If filled in then a copy of this wave (actually only the root blip) will be Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-03-05 04:12:44 UTC (rev 1732) +++ trunk/src/main/webapp/ws.html 2012-03-05 17:11:43 UTC (rev 1733) @@ -14,10 +14,10 @@ --> <meta name="kune.default.site.commonname" content="this site" /> <meta name="emite.httpBase" content="/http-bind/" /> -<meta name="emite.host" content="local.net" /> -<meta name="emite.searchHost" content="search.local.net" /> +<meta name="emite.host" content="localhost" /> +<meta name="emite.searchHost" content="search.localhost" />  -<meta name="hablar.roomService" content="rooms.local.net" /> +<meta name="hablar.roomService" content="rooms.localhost" /> <meta name="hablar.login" content="false" /> <meta name="hablar.hasVCard" content="false" /> <meta name="hablar.search" content="false" />

1 0

r1732 - in trunk: . src/main/java/cc/kune/core/server/auth src/main/java/cc/kune/core/server/auth/openfire src/main/java/cc/kune/core/server/init src/main/java/cc/kune/core/shared/domain src/main/java/cc/kune/gspace/client/options/general src/main/java/org/waveprotocol src/test/java/cc/kune/core/server/auth src/test/java/cc/kune/core/server/auth/openfire
by Vicente J. Ruiz Jurado 05 Mar '12

05 Mar '12

Author: vjrj_ Date: 2012-03-05 05:12:44 +0100 (Mon, 05 Mar 2012) New Revision: 1732 Added: trunk/src/main/java/cc/kune/core/server/auth/openfire/ trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java trunk/src/test/java/cc/kune/core/server/auth/openfire/ trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java Removed: trunk/src/main/java/cc/kune/core/shared/domain/dto/ trunk/src/main/java/org/waveprotocol/box/ Modified: trunk/.classpath trunk/DEV-GUIDE trunk/TODO trunk/TODO_done trunk/pom.xml trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java Log: Openfire Auth Provider added Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/.classpath 2012-03-05 04:12:44 UTC (rev 1732) @@ -1,167 +1,162 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"> - <attributes> - <attribute name="org.eclipse.jst.component.nondependency" value=""/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.12/box-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> - <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.12/client-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.12/client-common-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/bradrydzewski/gwt-cal/0.9.3-dndCreation/gwt-cal-0.9.3-dndCreation.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/dnd/gwt-dnd/gwt-dnd/3.0.1/gwt-dnd-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2.jar" sourcepath="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> - <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar" sourcepath="M2_REPO/org/json/json/20080701/json-20080701-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.8.1.0/liquibase-plugin-1.8.1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.12/proto-msg-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.1.0/smack-3.1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt/23-10-2011/socketio-gwt-23-10-2011.jar"/> - <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt-sources/23-10-2011/socketio-gwt-sources-23-10-2011.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.12/waveinabox-server-0.3-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> - <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> - <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry including="**/*.java" kind="src" path=".apt_generated"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> - <classpathentry kind="output" path="target/kune-0.1.0-SNAPSHOT/WEB-INF/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/kune-0.1.0-SNAPSHOT/WEB-INF/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.12/box-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> + <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.12/client-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.12/client-common-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/bradrydzewski/gwt-cal/0.9.3-dndCreation/gwt-cal-0.9.3-dndCreation.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/dnd/gwt-dnd/gwt-dnd/3.0.1/gwt-dnd-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2.jar" sourcepath="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> + <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/3.3.0/jna-3.3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar" sourcepath="M2_REPO/org/json/json/20080701/json-20080701-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.8.1.0/liquibase-plugin-1.8.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/igniterealtime/openfire/3.7.0/openfire-3.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.12/proto-msg-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.1.0/smack-3.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt/23-10-2011/socketio-gwt-23-10-2011.jar"/> + <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt-sources/23-10-2011/socketio-gwt-sources-23-10-2011.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.12/waveinabox-server-0.3-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> +</classpath> \ No newline at end of file Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/DEV-GUIDE 2012-03-05 04:12:44 UTC (rev 1732) @@ -129,7 +129,7 @@ Lauch the first to start the kune server (the first time that starts, will initialize the database). After that, launch the second to start kune in hosted mode and connect to the previous server, so you can make code modifications, and refresh the browser to see the changes. -Window users should create a kune server run external configuration to run "mvn exec:java" because the previous lauch runs in GNU/Linux systems. +Window users should create a kune server run external configuration to run "mvn exec:java" because the previous launch runs in GNU/Linux systems. ==== Optionally ==== Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/TODO 2012-03-05 04:12:44 UTC (rev 1732) @@ -12,18 +12,13 @@ nick == assigned to * SHORT-TERM (URGENT) -** icons in WIAB -<div class="NWC"> -<div class="ILC"></div> -</div> - -.ILC { - background: url("data:image/png;base6,4iVBORw0KGgoAAAANSUhEUgAAAA4AAAAWCAYAAADwza0nAAAAXUlEQVR42mNgGAWUgbS0tP8gTLKmp0+f/r927RrxmmGaQPTx48f/79y5k7BmZJtAmkD8VatW4deIrglkE0wTCAxlTcihR1ATTCO20MOrCaaRJJvQkxQME6VpFOAGALlX45hq7h8nAAAAAElFTkSuQmCC") no-repeat scroll 0 0 transparent; - height: 22px; - overflow: hidden; - width: 14px; -} - +** Custom Auth + http://www.igniterealtime.org/builds/openfire/docs/latest/documentation/jav… + provider.auth.className=org.jivesoftware.openfire.auth.HybridAuthProvider + hybridAuthProvider.primaryProvider.className = org.jivesoftware.openfire.auth.JDBCAuthProvider + hybridAuthProvider.secondaryProvider.className = cc.kune.core.server.auth.openfire.KuneAuthProvider +cp /tmp/model.jar apache-wave-model.jar +cp /tmp/kune-0.1.0-SNAPSHOT-jar-openfire-customauth.jar kune-authprovider.jar ** deploy automatize (update) *** copy jar *** copy via rsync gwt compilation (no delete to prevent code fail message) @@ -127,7 +122,6 @@ ***** People must be invited to join the group and post or read messages. Your group and its archives do not appear in public Google search results or the directory. ***** In Kune: no ** TODO >> Delete host/room conf in ws.html -** TODO >> kune.properties from cmd line ** TODO HelloWorld with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... ** WIAB under proxies https://groups.google.com/group/wave-protocol/browse_thread/thread/202dee4b… @@ -171,15 +165,18 @@ - gtx - smartclient - -** wave client integration -*** Documentation -**** Debug: client / server (see launch confs) -**** Hosted Mode support for websocket -***** Test that websocket is supported in your GWT Hosted Mode browser: +** Documentation + CLOSED: [2012-03-04 dom 22:51] +*** Windows users +http://dev.mysql.com/downloads/mysql/ +http://dev.mysql.com/downloads/gui-tools/5.0.html (recomended) +*** Debug: client / server (see launch confs) +*** Hosted Mode support for websocket +**** Test that websocket is supported in your GWT Hosted Mode browser: http://www.websockets.org/ http://jimbergman.net/websocket-web-browser-test/ -***** if not: -****** Install nighty firefox (for hosted-mode and websocket support) +**** if not: +***** Install newest firefox (for hosted-mode and websocket support) add-apt-repository ppa:ubuntu-mozilla-daily/ppa apt-get update @@ -192,8 +189,6 @@ for user bookmarks/favorites/links ** Do something with jetty/jruby alias issue http://jetty.mortbay.org/jetty5/faq/faq_s_400-Security_t_Aliases.html -** Use of webdriver instead of plain selenium - http://code.google.com/p/webdriver/ ** New Action (Command) class *** Things to support - [X] menu and toolbars separators (space, bar, expand) Modified: trunk/TODO_done =================================================================== --- trunk/TODO_done 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/TODO_done 2012-03-05 04:12:44 UTC (rev 1732) @@ -283,7 +283,23 @@ :ARCHIVE_CATEGORY: TODO :ARCHIVE_TODO: TODO :END: +* icons in WIAB :ARCHIVE: + :PROPERTIES: + :ARCHIVE_TIME: 2012-03-05 lun 04:48 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :END: +<div class="NWC"> +<div class="ILC"></div> +</div> +.ILC { + background: url("data:image/png;base6,4iVBORw0KGgoAAAANSUhEUgAAAA4AAAAWCAYAAADwza0nAAAAXUlEQVR42mNgGAWUgbS0tP8gTLKmp0+f/r927RrxmmGaQPTx48f/79y5k7BmZJtAmkD8VatW4deIrglkE0wTCAxlTcihR1ATTCO20MOrCaaRJJvQkxQME6VpFOAGALlX45hq7h8nAAAAAElFTkSuQmCC") no-repeat scroll 0 0 transparent; + height: 22px; + overflow: hidden; + width: 14px; +} @@ -299,3 +315,5 @@ + + Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/pom.xml 2012-03-05 04:12:44 UTC (rev 1732) @@ -20,6 +20,7 @@ <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> <wiab.version>0.3.12</wiab.version> + <jetty.version>8.0.1.v20110908</jetty.version> <skipTests>true</skipTests> </properties> <repositories> @@ -74,10 +75,10 @@ <url>http://gwt-maven-rewraps.googlecode.com/hg/</url> </repository>  - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> +  +  +  +    + <dependency> + <groupId>org.igniterealtime</groupId> + <artifactId>openfire</artifactId> + <version>3.7.0</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> +  + </exclusion> + </exclusions> + </dependency> </dependencies> -    @@ -930,21 +943,21 @@ <mainClass>cc.kune.wave.server.WaveMain</mainClass> </manifest> </archive> - - - +  +  +  <dependencySets> <dependencySet> <outputDirectory>/</outputDirectory> <scope>runtime</scope> <unpackOptions> - - - - - - - +  +  +  +  +  +  +  <includes> <include>${basedir}/target/kune-0.1.0-SNAPSHOT/ws/**</include> <include>${basedir}/src/main/webapp/**</include> @@ -1011,7 +1024,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.0.1.v20110908</version> + <version>${jetty.version}</version> <configuration> <webAppConfig>  Added: trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java 2012-03-05 04:12:44 UTC (rev 1732) @@ -0,0 +1,129 @@ +package cc.kune.core.server.auth.openfire; + +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.ObjectInputStream; + +import org.jivesoftware.openfire.auth.AuthProvider; +import org.jivesoftware.openfire.auth.ConnectionException; +import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; +import org.jivesoftware.openfire.auth.UnauthorizedException; +import org.jivesoftware.openfire.user.UserNotFoundException; +import org.waveprotocol.wave.model.wave.ParticipantId; + +public class KuneAuthProvider implements AuthProvider { + + protected class ClassLoadingObjectInputStream extends ObjectInputStream { + + /** + * Code copied from HashSessionManager + * + * @throws IOException + */ + public ClassLoadingObjectInputStream() throws IOException { + super(); + } + + public ClassLoadingObjectInputStream(final java.io.InputStream in) throws IOException { + super(in); + } + + @Override + public Class<?> resolveClass(final java.io.ObjectStreamClass cl) throws IOException, + ClassNotFoundException { + try { + return Class.forName(cl.getName(), false, Thread.currentThread().getContextClassLoader()); + } catch (final ClassNotFoundException e) { + return super.resolveClass(cl); + } + } + } + + private static final String USER_NOT_LOGGED = "User not logged"; + + @SuppressWarnings("unused") + @Override + public void authenticate(final String username, final String token) throws UnauthorizedException, + ConnectionException, InternalUnauthenticatedException { + try { + final File session = new File("/var/lib/kune/_sessions/" + token); + boolean logged = false; + if (session.exists()) { + final FileInputStream is = new FileInputStream(session); + final DataInputStream in = new DataInputStream(is); + + final String clusterId = in.readUTF(); + in.readUTF(); // nodeId + final long created = in.readLong(); + final long accessed = in.readLong(); + final int requests = in.readInt(); + + final int size = in.readInt(); + if (size > 0) { + final ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(in); + for (int i = 0; i < size; i++) { + final String key = ois.readUTF(); + final Object value = ois.readObject(); + if (value instanceof ParticipantId) { + if (((ParticipantId) value).getAddress().startsWith(username + "@")) { + logged = true; + break; + } + } + } + ois.close(); + } + in.close(); + is.close(); + if (!logged) { + throw new UnauthorizedException("Incorrect username"); + } + } else { + throw new UnauthorizedException(USER_NOT_LOGGED); + } + } catch (final FileNotFoundException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } catch (final IOException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } catch (final ClassNotFoundException e) { + throw new UnauthorizedException(USER_NOT_LOGGED, e); + } + } + + @Override + public void authenticate(final String username, final String token, final String digest) + throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException { + throw new UnsupportedOperationException(); + } + + @Override + public String getPassword(final String arg0) throws UserNotFoundException, + UnsupportedOperationException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDigestSupported() { + return false; + } + + @Override + public boolean isPlainSupported() { + return true; + } + + @Override + public void setPassword(final String arg0, final String arg1) throws UserNotFoundException, + UnsupportedOperationException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean supportsPasswordRetrieval() { + return false; + } + +} Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-05 04:12:44 UTC (rev 1732) @@ -213,7 +213,6 @@ groupManager.getSiteDefaultGroup(); } catch (final NoResultException e) { initialize(); - // } catch (final MySQLSyntaxErrorException e2) { } catch (final SQLGrammarException e3) { // Seems like in Windows we get this Exception instead initialize(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-04 19:03:36 UTC (rev 1731) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-05 04:12:44 UTC (rev 1732) @@ -81,7 +81,7 @@ @Override public void onSuccess(final Void result) { - NotifyUser.info("Sended. Check your email for the verification link."); + NotifyUser.info(i18n.t("Sended. Check your email for the verification link.")); } }); } Added: trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java 2012-03-05 04:12:44 UTC (rev 1732) @@ -0,0 +1,18 @@ +package cc.kune.core.server.auth.openfire; + +import org.jivesoftware.openfire.auth.ConnectionException; +import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; +import org.jivesoftware.openfire.auth.UnauthorizedException; +import org.junit.Ignore; +import org.junit.Test; + +public class KuneAuthProviderTest { + + @Test + @Ignore + public void maintest() throws UnauthorizedException, ConnectionException, + InternalUnauthenticatedException { + final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "169le0ik2rma81xhj4560ul7fm"); + } +}

1 0

r1731 - trunk/src/main/java/cc/kune/core/server/init
by Vicente J. Ruiz Jurado 04 Mar '12

04 Mar '12

Author: vjrj_ Date: 2012-03-04 20:03:36 +0100 (Sun, 04 Mar 2012) New Revision: 1731 Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java Log: W$ fix Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-02-29 19:28:31 UTC (rev 1730) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2012-03-04 19:03:36 UTC (rev 1731) @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.exception.SQLGrammarException; import org.waveprotocol.box.server.authentication.PasswordDigest; import cc.kune.core.client.errors.UserMustBeLoggedException; @@ -211,10 +212,11 @@ try { groupManager.getSiteDefaultGroup(); } catch (final NoResultException e) { - LOG.warn("The default group '" + properties.getDefaultSiteName() - + "' does not exist in Database, " - + "creating it (see kune.default.site.shortName in kune.properties for more details)"); - initDatabase(); + initialize(); + // } catch (final MySQLSyntaxErrorException e2) { + } catch (final SQLGrammarException e3) { + // Seems like in Windows we get this Exception instead + initialize(); } translationService.init(); } @@ -226,4 +228,10 @@ createProperties(); createDefUsersGroup(); } + + private void initialize() throws Exception { + LOG.warn("The default group '" + properties.getDefaultSiteName() + "' does not exist in Database, " + + "creating it (see kune.default.site.shortName in kune.properties for more details)"); + initDatabase(); + } }

1 0

r1730 - trunk/src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 29 Feb '12

29 Feb '12

Author: vjrj_ Date: 2012-02-29 20:28:31 +0100 (Wed, 29 Feb 2012) New Revision: 1730 Modified: trunk/src/main/webapp/tutorials/barters.svg trunk/src/main/webapp/tutorials/blogs.svg trunk/src/main/webapp/tutorials/chats.svg trunk/src/main/webapp/tutorials/docs.svg trunk/src/main/webapp/tutorials/events.svg trunk/src/main/webapp/tutorials/lists.svg trunk/src/main/webapp/tutorials/tasks.svg trunk/src/main/webapp/tutorials/wiki.svg Log: Fixed font issue with tutorials Modified: trunk/src/main/webapp/tutorials/barters.svg =================================================================== --- trunk/src/main/webapp/tutorials/barters.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/barters.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/blogs.svg =================================================================== --- trunk/src/main/webapp/tutorials/blogs.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/blogs.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/chats.svg =================================================================== --- trunk/src/main/webapp/tutorials/chats.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/chats.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/docs.svg =================================================================== --- trunk/src/main/webapp/tutorials/docs.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/docs.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -60,6 +60,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <defs id="defs4"> <inkscape:perspective Modified: trunk/src/main/webapp/tutorials/events.svg =================================================================== --- trunk/src/main/webapp/tutorials/events.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/events.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/lists.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/lists.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/tasks.svg =================================================================== --- trunk/src/main/webapp/tutorials/tasks.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/tasks.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff" Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-02-29 18:58:23 UTC (rev 1729) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-02-29 19:28:31 UTC (rev 1730) @@ -30,6 +30,12 @@ xlink:href="lang.js" id="kunelang" />  +  + <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> + <style> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  <sodipodi:namedview id="base" pagecolor="#ffffff"

1 0

r1729 - trunk/src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 29 Feb '12

29 Feb '12

Author: vjrj_ Date: 2012-02-29 19:58:23 +0100 (Wed, 29 Feb 2012) New Revision: 1729 Modified: trunk/src/main/webapp/tutorials/docs.svg Log: Docs frame invisible Modified: trunk/src/main/webapp/tutorials/docs.svg =================================================================== --- trunk/src/main/webapp/tutorials/docs.svg 2012-02-29 18:49:28 UTC (rev 1728) +++ trunk/src/main/webapp/tutorials/docs.svg 2012-02-29 18:58:23 UTC (rev 1729) @@ -25,7 +25,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.7686691" - inkscape:cx="233.45046" + inkscape:cx="157.12188" inkscape:cy="1004.2198" inkscape:document-units="px" inkscape:current-layer="layer3" @@ -447,7 +447,7 @@ inkscape:groupmode="layer" id="layer5" inkscape:label="frames" - style="display:inline"> + style="display:none"> <rect transform="translate(0,435.8268)" style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635472;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"

1 0