- xwiki-devs@xwiki.org - lists.xwiki.org

[xwiki-devs] Question on modifying XWikiLogin
by rgbohner＠rockwellcollins.com 11 Apr '08

11 Apr '08

Hello, I would like to make a small modification to the XWikiLogin page on a local xwiki instance xwiki v 1.3 to better understand the different layers of configuration available for xwiki. There is an error occurring on this login page when xwiki is configured for LDAP authentication. When a user enters incorrect credentials, the login page does not provide any indication of an error while the LDAP.LDAPAuthServiceImpl class returns "LDAP Bind failed with Exception Invalid Credentials". What is the best route for adding error notification into the XWikiLogin page in the event of an invalid LDAP credentials error is propagated from LDAP.LDAPAuthServiceImpl? Thank you Ross

2 1

[xwiki-devs] [ANN] XWiki Enterprise Manager 1.2 Milestone 1 released
by Thomas Mortagne 11 Apr '08

11 Apr '08

The XWiki development team is pleased to announce the release of XWiki Enterprise Manager 1.2 Milestone 1. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This release follow XWiki Enterprise 1.4 Milestone 1 release to maintain XEM synchronised with XE. Changes from 1.1: The main change is XWiki Enterprise upgrade from 1.3 to 1.4M1. Wiki Manager also fix a bug in translations page and is now able to create a wiki with the name of one that just been deleted. For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM12M1 Thanks -The XWiki dev team

1 0

[xwiki-devs] [VOTE] Release XEM 1.2 M1
by Thomas Mortagne 11 Apr '08

11 Apr '08

Hi comitters, As XE 1.4M1 has been released and to follow its releases I would like to release XEM 1.2M1. Modification since XE 1.1 : - XE 1.3 to XE 1.4M1 modifications. - XAWM-63: Broken translations in wikis descritors sheet page - XAWM-62: Can't recreate a wiki which just been deleted Thanks, -- Thomas Mortagne

4 5

Re: [xwiki-devs] [xwiki-notifications] r9090 - in xwiki-platform/core/trunk/xwiki-core/src: main/java/com/xpn/xwiki/plugin/packaging test/java/com/xpn/xwiki/plugin/packaging
by Vincent Massol 11 Apr '08

11 Apr '08

Hi Anca, cool for the tests :) if you don't mind, some comments: * Why name the test ImportTest when the practice is to name it PackageTest and that class already exists? * There are lots of duplications with PackageTest * The test setup sounds very (too) complex * Missing spaces after comment //something vs // Something (note the uppercase to start a sentence :)) * several typos ;) Thanks -Vincent On Apr 11, 2008, at 3:01 PM, lucaa (SVN) wrote: > Author: lucaa > Date: 2008-04-11 15:01:25 +0200 (Fri, 11 Apr 2008) > New Revision: 9090 > > Added: > xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/ > plugin/packaging/ImportTest.java > Modified: > xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > plugin/packaging/Package.java > Log: > XWIKI-2283: Overwrite on importing translation documents deletes the > original document too > * Added a test on import overwrite to delete the translated document > * Added a couple of tests on importing in the ImportTest class > > > Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ > xwiki/plugin/packaging/Package.java > =================================================================== > --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > plugin/packaging/Package.java 2008-04-11 12:45:37 UTC (rev 9089) > +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > plugin/packaging/Package.java 2008-04-11 13:01:25 UTC (rev 9090) > @@ -574,8 +574,11 @@ > if (status == DocumentInfo.INSTALL_OK || status == > DocumentInfo.INSTALL_ALREADY_EXIST > && doc.getAction() == DocumentInfo.ACTION_OVERWRITE) { > if (status == DocumentInfo.INSTALL_ALREADY_EXIST) { > - XWikiDocument deleteddoc = > - > context.getWiki().getDocument(doc.getFullName(), context); > + XWikiDocument deleteddoc = > context.getWiki().getDocument(doc.getFullName(), context); > + //if this document is a translation: we should only > delete the translation > + if (doc.getDoc().getTranslation() != 0) { > + deleteddoc = > deleteddoc.getTranslatedDocument(doc.getLanguage(), context); > + } > try { > context.getWiki().deleteDocument(deleteddoc, > context); > } catch (Exception e) { > > Added: xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/ > xwiki/plugin/packaging/ImportTest.java > =================================================================== > --- xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/ > plugin/packaging/ImportTest.java (rev 0) > +++ xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/ > plugin/packaging/ImportTest.java 2008-04-11 13:01:25 UTC (rev 9090) > @@ -0,0 +1,357 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > + > +package com.xpn.xwiki.plugin.packaging; > + > +import java.io.BufferedReader; > +import java.io.ByteArrayOutputStream; > +import java.io.IOException; > +import java.io.OutputStreamWriter; > +import java.io.StringReader; > +import java.util.ArrayList; > +import java.util.Collections; > +import java.util.HashMap; > +import java.util.Iterator; > +import java.util.List; > +import java.util.Map; > +import java.util.zip.ZipEntry; > +import java.util.zip.ZipOutputStream; > + > +import org.jmock.Mock; > +import org.jmock.core.Invocation; > +import org.jmock.core.stub.CustomStub; > +import org.jmock.core.stub.VoidStub; > +import org.xwiki.component.manager.ComponentManager; > + > +import sun.reflect.generics.tree.VoidDescriptor; > + > +import com.xpn.xwiki.XWiki; > +import com.xpn.xwiki.XWikiConfig; > +import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.store.XWikiHibernateRecycleBinStore; > +import com.xpn.xwiki.store.XWikiHibernateStore; > +import com.xpn.xwiki.store.XWikiHibernateVersioningStore; > +import com.xpn.xwiki.store.XWikiStoreInterface; > +import com.xpn.xwiki.store.XWikiVersioningStoreInterface; > +import com.xpn.xwiki.test.AbstractXWikiComponentTestCase; > +import com.xpn.xwiki.user.api.XWikiRightService; > + > +public class ImportTest extends AbstractXWikiComponentTestCase > +{ > + private Package pack; > + private XWikiContext context; > + private XWiki xwiki; > + private Mock mockXWikiStore; > + private Mock mockRecycleBinStore; > + private Mock mockXWikiVersioningStore; > + private Mock mockRightService; > + private Map docs = new HashMap(); > + > + protected void setUp() throws Exception > + { > + this.pack = new Package(); > + this.context = new XWikiContext(); > + this.xwiki = new XWiki(new XWikiConfig(), this.context); > + > + // We need to initialize the Component Manager so that > tcomponents can be looked up > + this.context.put(ComponentManager.class.getName(), > getComponentManager()); > + > + //mock a store that would also hansle translations > + this.mockXWikiStore = > + mock(XWikiHibernateStore.class, new Class[] > {XWiki.class, XWikiContext.class}, > + new Object[] {this.xwiki, this.context}); > + this.mockXWikiStore.stubs().method("loadXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.loadXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument shallowDoc = (XWikiDocument) > invocation.parameterValues.get(0); > + String documentKey = shallowDoc.getFullName(); > + if (!shallowDoc.getLanguage().equals("")) { > + documentKey += "." + shallowDoc.getLanguage(); > + } > + if (docs.containsKey(documentKey)) { > + return (XWikiDocument) docs.get(documentKey); > + } else { > + return shallowDoc; > + } > + } > + }); > + this.mockXWikiStore.stubs().method("saveXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.saveXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = (XWikiDocument) > invocation.parameterValues.get(0); > + document.setNew(false); > + document.setStore((XWikiStoreInterface) > mockXWikiStore.proxy()); > + //if this is a translated document, append a > language prefix > + String documentKey = document.getFullName(); > + if (!document.getLanguage().equals("")) { > + documentKey += "." + document.getLanguage(); > + } > + docs.put(documentKey, document); > + return null; > + } > + }); > + this.mockXWikiStore.stubs().method("deleteXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.deleteXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = (XWikiDocument) > invocation.parameterValues.get(0); > + //delete the document from the map > + String documentKey = document.getFullName(); > + if (!document.getLanguage().equals("")) { > + documentKey += "." + document.getLanguage(); > + } > + docs.remove(documentKey); > + return null; > + } > + }); > + > this.mockXWikiStore.stubs().method("getTranslationList").will( > + new CustomStub("Implements > XWikiStoreInterface.getTranslationList") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = > (XWikiDocument)invocation.parameterValues.get(0); > + //search for this document in the map and return it's > translations > + List translationList = new ArrayList(); > + for (Iterator pairsIt = docs.entrySet().iterator(); > pairsIt.hasNext();) { > + Map.Entry currentEntry = (Map.Entry)pairsIt.next(); > + if > (((String)currentEntry.getKey()).startsWith(document.getFullName()) > + && ! > ((XWikiDocument)currentEntry.getValue()).getLanguage().equals("")) { > + //yeeey, it's a translation > + > translationList > .add(((XWikiDocument)currentEntry.getValue()).getLanguage()); > + } > + } > + return translationList; > + } > + } > + ); > + > this > .mockXWikiStore > .stubs().method("injectCustomMapping").will(returnValue(false)); > + > + this.mockRecycleBinStore = > mock(XWikiHibernateRecycleBinStore.class, > + new Class[] {XWikiContext.class}, new Object[] > {this.context}); > + > this > .mockRecycleBinStore > .stubs().method("saveToRecycleBin").will(VoidStub.INSTANCE); > + > + this.mockXWikiVersioningStore = > + mock(XWikiHibernateVersioningStore.class, new Class[] > {XWiki.class, > + XWikiContext.class}, new Object[] {this.xwiki, > this.context}); > + > this > .mockXWikiVersioningStore > .stubs().method("getXWikiDocumentArchive").will( > + returnValue(null)); > + > this > .mockXWikiVersioningStore > .stubs().method("resetRCSArchive").will(returnValue(null)); > + > + this.xwiki.setStore((XWikiStoreInterface) > mockXWikiStore.proxy()); > + > this > .xwiki > .setRecycleBinStore > ((XWikiHibernateRecycleBinStore)this.mockRecycleBinStore.proxy()); > + > this.xwiki.setVersioningStore((XWikiVersioningStoreInterface) > mockXWikiVersioningStore > + .proxy()); > + > + //mock the right service > + this.mockRightService = mock(XWikiRightService.class); > + > this > .mockRightService > .stubs().method("checkAccess").will(returnValue(true)); > + > this > .mockRightService > .stubs().method("hasAdminRights").will(returnValue(true)); > + > this > .xwiki > .setRightService((XWikiRightService)this.mockRightService.proxy()); > + } > + > + /** > + * Test the regular document import. > + * > + * @throws Exception > + */ > + public void testImportDocument() throws Exception > + { > + XWikiDocument doc1 = new XWikiDocument("Test", "DocImport"); > + doc1.setDefaultLanguage("en"); > + > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {doc1}, new String[] {"ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + //import and install this document > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if it is there > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocImport", this.context); > + assertFalse(foundDocument.isNew()); > + > + XWikiDocument nonExistingDocument = > this.xwiki.getDocument("Test.DocImportNonexisting", this.context); > + assertTrue(nonExistingDocument.isNew()); > + > + XWikiDocument foundTranslationDocument = > foundDocument.getTranslatedDocument("fr", this.context); > + assertSame(foundDocument, foundTranslationDocument); > + > + XWikiDocument doc1Translation = new XWikiDocument("Test", > "DocImport"); > + doc1Translation.setLanguage("fr"); > + doc1Translation.setDefaultLanguage("en"); > + this.xwiki.saveDocument(doc1Translation, this.context); > + foundTranslationDocument = > foundDocument.getTranslatedDocument("fr", this.context); > + assertNotSame(foundDocument, foundTranslationDocument); > + } > + > + /** > + * Test the import with document overwrite. > + * > + * @throws Exception > + */ > + public void testImportOverwriteDocument() throws Exception > + { > + XWikiDocument doc1 = new XWikiDocument("Test", > "DocImportOverwrite"); > + doc1.setDefaultLanguage("en"); > + > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {doc1}, new String[] {"ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + //import and install this document > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if it is there > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocImportOverwrite", this.context); > + assertFalse(foundDocument.isNew()); > + > + //create the overwriting document > + String newContent = "This is new content"; > + XWikiDocument overwritingDoc = new XWikiDocument("Test", > "DocImportOverwrite"); > + overwritingDoc.setContent(newContent); > + > + zipFile = this.createZipFile(new XWikiDocument[] > {overwritingDoc}, new String[] {"ISO-8859-1"}); > + > + //use a new packager because we need to clean-up import data > (files list, doucument data) > + this.pack = new Package(); > + //import and install > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if the document is there > + XWikiDocument foundOverwritingDoc = > this.xwiki.getDocument("Test.DocImportOverwrite", this.context); > + assertFalse(foundOverwritingDoc.isNew()); > + assertEquals(foundOverwritingDoc.getContent(), newContent); > + } > + > + /** > + * Test the import of translation files, with overwrite. > + * @throws Exception > + */ > + public void testImportTranslationsOverwrite() throws Exception > + { > + XWikiDocument original = new XWikiDocument("Test", > "DocTranslation"); > + original.setDefaultLanguage("en"); > + original.setTranslation(0); > + XWikiDocument translation = new XWikiDocument("Test", > "DocTranslation"); > + translation.setLanguage("fr"); > + translation.setDefaultLanguage("en"); > + translation.setTranslation(1); > + translation.setOriginalDocument(original); > + > + //import and install those twice with tests > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {original, translation}, > + new String[] {"ISO-8859-1", "ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocTranslation", this.context); > + assertFalse(foundDocument.isNew()); > + //get the translation > + XWikiDocument translationDoc = > foundDocument.getTranslatedDocument("fr", this.context); > + assertFalse(translationDoc.isNew()); > + > + //use a new packager because we need to clean-up import data > (files list, doucument data) > + this.pack = new Package(); > + //import again and do the same tests > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + foundDocument = this.xwiki.getDocument("Test.DocTranslation", > this.context); > + //might not be the best method to test the document is in the > store though... > + assertFalse(foundDocument.isNew()); > + //get the translation > + translationDoc = foundDocument.getTranslatedDocument("fr", > this.context); > + assertFalse(translationDoc.isNew()); > + } > + > + private String getPackageXML(XWikiDocument docs[]) > + { > + StringBuilder sb = new StringBuilder(); > + sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> > \n"); > + sb.append("<package>\n").append("<infos> > \n").append("<name>Backup</name>\n"); > + sb.append("<description>on Mon Jan 01 01:44:32 CET 2007 by > XWiki.Admin</description>\n"); > + sb.append("<licence></licence>\n"); > + sb.append("<author>XWiki.Admin</author>\n"); > + sb.append("<version></version>\n"); > + sb.append("<backupPack>true</backupPack>\n"); > + sb.append("</infos>\n"); > + sb.append("<files>\n"); > + for (int i = 0; i < docs.length; i++) { > + > + sb.append( > + "<file defaultAction=\"0\" language=\"" + > docs[i].getLanguage() + "\">" + docs[i].getFullName() + "</file>\n"); > + } > + sb.append("</files></package>\n"); > + return sb.toString(); > + } > + > + private byte[] getEncodedByteArray(String content, String > charset) throws IOException > + { > + StringReader rdr = new StringReader(content); > + BufferedReader bfr = new BufferedReader(rdr); > + ByteArrayOutputStream ostr = new ByteArrayOutputStream(); > + OutputStreamWriter os = new OutputStreamWriter(ostr, > charset); > + > + // Voluntarily ignore the first line... as it's the xml > declaration > + String line = bfr.readLine(); > + os.append("<?xml version=\"1.0\" encoding=\"" + charset + > "\"?>\n"); > + > + line = bfr.readLine(); > + while (null != line) { > + os.append(line); > + os.append("\n"); > + line = bfr.readLine(); > + } > + os.flush(); > + os.close(); > + return ostr.toByteArray(); > + } > + > + private byte[] createZipFile(XWikiDocument docs[], String[] > encodings) throws Exception > + { > + ByteArrayOutputStream baos = new ByteArrayOutputStream(); > + ZipOutputStream zos = new ZipOutputStream(baos); > + ZipEntry zipp = new ZipEntry("package.xml"); > + zos.putNextEntry(zipp); > + zos.write(getEncodedByteArray(getPackageXML(docs), > "ISO-8859-1")); > + for (int i = 0; i < docs.length; i++) { > + String zipEntryName = docs[i].getSpace() + "/" + > docs[i].getName(); > + if (docs[i].getTranslation() != 0) { > + zipEntryName += "." + docs[i].getLanguage(); > + } > + ZipEntry zipe = new ZipEntry(zipEntryName); > + zos.putNextEntry(zipe); > + String xmlCode = docs[i].toXML(false, false, false, > false, context); > + zos.write(getEncodedByteArray(xmlCode, encodings[i])); > + } > + zos.closeEntry(); > + return baos.toByteArray(); > + } > +} > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

3 5

Re: [xwiki-devs] [xwiki-notifications] r9092 - in xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src: main/java/com/xpn/xwiki/plugin/packaging test/java/com/xpn/xwiki/plugin/packaging
by Vincent Massol 11 Apr '08

11 Apr '08

Another comment. I think the code can be slightly improved: Replace: XWikiDocument deleteddoc = context.getWiki().getDocument(doc.getFullName(), context); //if this document is a translation: we should only delete the translation if (doc.getDoc().getTranslation() != 0) { deleteddoc = deleteddoc.getTranslatedDocument(doc.getLanguage(), context); } With: if (doc.getDoc().getTranslation() != 0) { deleteddoc = deleteddoc.getTranslatedDocument(doc.getLanguage(), context); } else { [...] } This doesn't execute context.getWiki().getDocument(doc.getFullName(), context); when it's not required and make the code more balanced. Maybe also replace deleteddoc by docToDelete? Thanks! -Vincent On Apr 11, 2008, at 3:27 PM, lucaa (SVN) wrote: > Author: lucaa > Date: 2008-04-11 15:27:53 +0200 (Fri, 11 Apr 2008) > New Revision: 9092 > > Added: > xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/test/ > java/com/xpn/xwiki/plugin/packaging/ImportTest.java > Modified: > xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/plugin/packaging/Package.java > Log: > XWIKI-2283: Overwrite on importing translation documents deletes the > original document too > * Added a test on import overwrite to delete the translated document > * Added a couple of tests on importing in the ImportTest class > > > Modified: xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/ > main/java/com/xpn/xwiki/plugin/packaging/Package.java > =================================================================== > --- xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/plugin/packaging/Package.java 2008-04-11 13:04:18 > UTC (rev 9091) > +++ xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/plugin/packaging/Package.java 2008-04-11 13:27:53 > UTC (rev 9092) > @@ -561,8 +561,11 @@ > if (status == DocumentInfo.INSTALL_OK || status == > DocumentInfo.INSTALL_ALREADY_EXIST > && doc.getAction() == DocumentInfo.ACTION_OVERWRITE) { > if (status == DocumentInfo.INSTALL_ALREADY_EXIST) { > - XWikiDocument deleteddoc = > - > context.getWiki().getDocument(doc.getFullName(), context); > + XWikiDocument deleteddoc = > context.getWiki().getDocument(doc.getFullName(), context); > + //if this document is a translation: we should only > delete the translation > + if (doc.getDoc().getTranslation() != 0) { > + deleteddoc = > deleteddoc.getTranslatedDocument(doc.getLanguage(), context); > + } > try { > context.getWiki().deleteDocument(deleteddoc, > context); > } catch (Exception e) { > > Added: xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/ > test/java/com/xpn/xwiki/plugin/packaging/ImportTest.java > =================================================================== > --- xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/test/ > java/com/xpn/xwiki/plugin/packaging/ > ImportTest.java (rev 0) > +++ xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/test/ > java/com/xpn/xwiki/plugin/packaging/ImportTest.java 2008-04-11 > 13:27:53 UTC (rev 9092) > @@ -0,0 +1,357 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > + > +package com.xpn.xwiki.plugin.packaging; > + > +import java.io.BufferedReader; > +import java.io.ByteArrayOutputStream; > +import java.io.IOException; > +import java.io.OutputStreamWriter; > +import java.io.StringReader; > +import java.util.ArrayList; > +import java.util.Collections; > +import java.util.HashMap; > +import java.util.Iterator; > +import java.util.List; > +import java.util.Map; > +import java.util.zip.ZipEntry; > +import java.util.zip.ZipOutputStream; > + > +import org.jmock.Mock; > +import org.jmock.core.Invocation; > +import org.jmock.core.stub.CustomStub; > +import org.jmock.core.stub.VoidStub; > +import org.xwiki.component.manager.ComponentManager; > + > +import sun.reflect.generics.tree.VoidDescriptor; > + > +import com.xpn.xwiki.XWiki; > +import com.xpn.xwiki.XWikiConfig; > +import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.store.XWikiHibernateRecycleBinStore; > +import com.xpn.xwiki.store.XWikiHibernateStore; > +import com.xpn.xwiki.store.XWikiHibernateVersioningStore; > +import com.xpn.xwiki.store.XWikiStoreInterface; > +import com.xpn.xwiki.store.XWikiVersioningStoreInterface; > +import com.xpn.xwiki.test.AbstractXWikiComponentTestCase; > +import com.xpn.xwiki.user.api.XWikiRightService; > + > +public class ImportTest extends AbstractXWikiComponentTestCase > +{ > + private Package pack; > + private XWikiContext context; > + private XWiki xwiki; > + private Mock mockXWikiStore; > + private Mock mockRecycleBinStore; > + private Mock mockXWikiVersioningStore; > + private Mock mockRightService; > + private Map docs = new HashMap(); > + > + protected void setUp() throws Exception > + { > + this.pack = new Package(); > + this.context = new XWikiContext(); > + this.xwiki = new XWiki(new XWikiConfig(), this.context); > + > + // We need to initialize the Component Manager so that > tcomponents can be looked up > + this.context.put(ComponentManager.class.getName(), > getComponentManager()); > + > + //mock a store that would also hansle translations > + this.mockXWikiStore = > + mock(XWikiHibernateStore.class, new Class[] > {XWiki.class, XWikiContext.class}, > + new Object[] {this.xwiki, this.context}); > + this.mockXWikiStore.stubs().method("loadXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.loadXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument shallowDoc = (XWikiDocument) > invocation.parameterValues.get(0); > + String documentKey = shallowDoc.getFullName(); > + if (!shallowDoc.getLanguage().equals("")) { > + documentKey += "." + shallowDoc.getLanguage(); > + } > + if (docs.containsKey(documentKey)) { > + return (XWikiDocument) docs.get(documentKey); > + } else { > + return shallowDoc; > + } > + } > + }); > + this.mockXWikiStore.stubs().method("saveXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.saveXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = (XWikiDocument) > invocation.parameterValues.get(0); > + document.setNew(false); > + document.setStore((XWikiStoreInterface) > mockXWikiStore.proxy()); > + //if this is a translated document, append a > language prefix > + String documentKey = document.getFullName(); > + if (!document.getLanguage().equals("")) { > + documentKey += "." + document.getLanguage(); > + } > + docs.put(documentKey, document); > + return null; > + } > + }); > + this.mockXWikiStore.stubs().method("deleteXWikiDoc").will( > + new CustomStub("Implements > XWikiStoreInterface.deleteXWikiDoc") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = (XWikiDocument) > invocation.parameterValues.get(0); > + //delete the document from the map > + String documentKey = document.getFullName(); > + if (!document.getLanguage().equals("")) { > + documentKey += "." + document.getLanguage(); > + } > + docs.remove(documentKey); > + return null; > + } > + }); > + > this.mockXWikiStore.stubs().method("getTranslationList").will( > + new CustomStub("Implements > XWikiStoreInterface.getTranslationList") > + { > + public Object invoke(Invocation invocation) throws > Throwable > + { > + XWikiDocument document = > (XWikiDocument)invocation.parameterValues.get(0); > + //search for this document in the map and return it's > translations > + List translationList = new ArrayList(); > + for (Iterator pairsIt = docs.entrySet().iterator(); > pairsIt.hasNext();) { > + Map.Entry currentEntry = (Map.Entry)pairsIt.next(); > + if > (((String)currentEntry.getKey()).startsWith(document.getFullName()) > + && ! > ((XWikiDocument)currentEntry.getValue()).getLanguage().equals("")) { > + //yeeey, it's a translation > + > translationList > .add(((XWikiDocument)currentEntry.getValue()).getLanguage()); > + } > + } > + return translationList; > + } > + } > + ); > + > this > .mockXWikiStore > .stubs().method("injectCustomMapping").will(returnValue(false)); > + > + this.mockRecycleBinStore = > mock(XWikiHibernateRecycleBinStore.class, > + new Class[] {XWikiContext.class}, new Object[] > {this.context}); > + > this > .mockRecycleBinStore > .stubs().method("saveToRecycleBin").will(VoidStub.INSTANCE); > + > + this.mockXWikiVersioningStore = > + mock(XWikiHibernateVersioningStore.class, new Class[] > {XWiki.class, > + XWikiContext.class}, new Object[] {this.xwiki, > this.context}); > + > this > .mockXWikiVersioningStore > .stubs().method("getXWikiDocumentArchive").will( > + returnValue(null)); > + > this > .mockXWikiVersioningStore > .stubs().method("resetRCSArchive").will(returnValue(null)); > + > + this.xwiki.setStore((XWikiStoreInterface) > mockXWikiStore.proxy()); > + > this > .xwiki > .setRecycleBinStore > ((XWikiHibernateRecycleBinStore)this.mockRecycleBinStore.proxy()); > + > this.xwiki.setVersioningStore((XWikiVersioningStoreInterface) > mockXWikiVersioningStore > + .proxy()); > + > + //mock the right service > + this.mockRightService = mock(XWikiRightService.class); > + > this > .mockRightService > .stubs().method("checkAccess").will(returnValue(true)); > + > this > .mockRightService > .stubs().method("hasAdminRights").will(returnValue(true)); > + > this > .xwiki > .setRightService((XWikiRightService)this.mockRightService.proxy()); > + } > + > + /** > + * Test the regular document import. > + * > + * @throws Exception > + */ > + public void testImportDocument() throws Exception > + { > + XWikiDocument doc1 = new XWikiDocument("Test", "DocImport"); > + doc1.setDefaultLanguage("en"); > + > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {doc1}, new String[] {"ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + //import and install this document > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if it is there > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocImport", this.context); > + assertFalse(foundDocument.isNew()); > + > + XWikiDocument nonExistingDocument = > this.xwiki.getDocument("Test.DocImportNonexisting", this.context); > + assertTrue(nonExistingDocument.isNew()); > + > + XWikiDocument foundTranslationDocument = > foundDocument.getTranslatedDocument("fr", this.context); > + assertSame(foundDocument, foundTranslationDocument); > + > + XWikiDocument doc1Translation = new XWikiDocument("Test", > "DocImport"); > + doc1Translation.setLanguage("fr"); > + doc1Translation.setDefaultLanguage("en"); > + this.xwiki.saveDocument(doc1Translation, this.context); > + foundTranslationDocument = > foundDocument.getTranslatedDocument("fr", this.context); > + assertNotSame(foundDocument, foundTranslationDocument); > + } > + > + /** > + * Test the import with document overwrite. > + * > + * @throws Exception > + */ > + public void testImportOverwriteDocument() throws Exception > + { > + XWikiDocument doc1 = new XWikiDocument("Test", > "DocImportOverwrite"); > + doc1.setDefaultLanguage("en"); > + > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {doc1}, new String[] {"ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + //import and install this document > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if it is there > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocImportOverwrite", this.context); > + assertFalse(foundDocument.isNew()); > + > + //create the overwriting document > + String newContent = "This is new content"; > + XWikiDocument overwritingDoc = new XWikiDocument("Test", > "DocImportOverwrite"); > + overwritingDoc.setContent(newContent); > + > + zipFile = this.createZipFile(new XWikiDocument[] > {overwritingDoc}, new String[] {"ISO-8859-1"}); > + > + //use a new packager because we need to clean-up import data > (files list, doucument data) > + this.pack = new Package(); > + //import and install > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + > + //check if the document is there > + XWikiDocument foundOverwritingDoc = > this.xwiki.getDocument("Test.DocImportOverwrite", this.context); > + assertFalse(foundOverwritingDoc.isNew()); > + assertEquals(foundOverwritingDoc.getContent(), newContent); > + } > + > + /** > + * Test the import of translation files, with overwrite. > + * @throws Exception > + */ > + public void testImportTranslationsOverwrite() throws Exception > + { > + XWikiDocument original = new XWikiDocument("Test", > "DocTranslation"); > + original.setDefaultLanguage("en"); > + original.setTranslation(0); > + XWikiDocument translation = new XWikiDocument("Test", > "DocTranslation"); > + translation.setLanguage("fr"); > + translation.setDefaultLanguage("en"); > + translation.setTranslation(1); > + translation.setOriginalDocument(original); > + > + //import and install those twice with tests > + byte[] zipFile = this.createZipFile(new XWikiDocument[] > {original, translation}, > + new String[] {"ISO-8859-1", "ISO-8859-1"}); > + > + //make sure no data is in the packager from the other tests run > + this.pack = new Package(); > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + XWikiDocument foundDocument = > this.xwiki.getDocument("Test.DocTranslation", this.context); > + assertFalse(foundDocument.isNew()); > + //get the translation > + XWikiDocument translationDoc = > foundDocument.getTranslatedDocument("fr", this.context); > + assertFalse(translationDoc.isNew()); > + > + //use a new packager because we need to clean-up import data > (files list, doucument data) > + this.pack = new Package(); > + //import again and do the same tests > + this.pack.Import(zipFile, this.context); > + this.pack.install(this.context); > + foundDocument = this.xwiki.getDocument("Test.DocTranslation", > this.context); > + //might not be the best method to test the document is in the > store though... > + assertFalse(foundDocument.isNew()); > + //get the translation > + translationDoc = foundDocument.getTranslatedDocument("fr", > this.context); > + assertFalse(translationDoc.isNew()); > + } > + > + private String getPackageXML(XWikiDocument docs[]) > + { > + StringBuilder sb = new StringBuilder(); > + sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> > \n"); > + sb.append("<package>\n").append("<infos> > \n").append("<name>Backup</name>\n"); > + sb.append("<description>on Mon Jan 01 01:44:32 CET 2007 by > XWiki.Admin</description>\n"); > + sb.append("<licence></licence>\n"); > + sb.append("<author>XWiki.Admin</author>\n"); > + sb.append("<version></version>\n"); > + sb.append("<backupPack>true</backupPack>\n"); > + sb.append("</infos>\n"); > + sb.append("<files>\n"); > + for (int i = 0; i < docs.length; i++) { > + > + sb.append( > + "<file defaultAction=\"0\" language=\"" + > docs[i].getLanguage() + "\">" + docs[i].getFullName() + "</file>\n"); > + } > + sb.append("</files></package>\n"); > + return sb.toString(); > + } > + > + private byte[] getEncodedByteArray(String content, String > charset) throws IOException > + { > + StringReader rdr = new StringReader(content); > + BufferedReader bfr = new BufferedReader(rdr); > + ByteArrayOutputStream ostr = new ByteArrayOutputStream(); > + OutputStreamWriter os = new OutputStreamWriter(ostr, > charset); > + > + // Voluntarily ignore the first line... as it's the xml > declaration > + String line = bfr.readLine(); > + os.append("<?xml version=\"1.0\" encoding=\"" + charset + > "\"?>\n"); > + > + line = bfr.readLine(); > + while (null != line) { > + os.append(line); > + os.append("\n"); > + line = bfr.readLine(); > + } > + os.flush(); > + os.close(); > + return ostr.toByteArray(); > + } > + > + private byte[] createZipFile(XWikiDocument docs[], String[] > encodings) throws Exception > + { > + ByteArrayOutputStream baos = new ByteArrayOutputStream(); > + ZipOutputStream zos = new ZipOutputStream(baos); > + ZipEntry zipp = new ZipEntry("package.xml"); > + zos.putNextEntry(zipp); > + zos.write(getEncodedByteArray(getPackageXML(docs), > "ISO-8859-1")); > + for (int i = 0; i < docs.length; i++) { > + String zipEntryName = docs[i].getSpace() + "/" + > docs[i].getName(); > + if (docs[i].getTranslation() != 0) { > + zipEntryName += "." + docs[i].getLanguage(); > + } > + ZipEntry zipe = new ZipEntry(zipEntryName); > + zos.putNextEntry(zipe); > + String xmlCode = docs[i].toXML(false, false, false, > false, context); > + zos.write(getEncodedByteArray(xmlCode, encodings[i])); > + } > + zos.closeEntry(); > + return baos.toByteArray(); > + } > +} > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

1 0

[xwiki-devs] Need to create UI forms in XWiki !
by Kamna Jain 11 Apr '08

11 Apr '08

Hello Devs, I have been trying to figure if there is a possibility of adding HTML forms (UI to obtain input from users) to Xwiki as part of the application we are trying to build. I know that XWiki pages can be edited to include HTML code in them. But, I guess my question is where should we be looking in the code to see how the data that goes into the form fields as user input, would be processed by the XWiki Core? Has anyone done this before ? Also, if we wanted to create standard UI in XWiki, would it be a better option to create a template (.vm) file for this purpose? We also looked at creating Classes and Objects for this purpose but, I am not sure if thats the option we need to choose. What would be the best way to accomplish this task? Thanks for all help.

4 3

Re: [xwiki-devs] [xwiki-notifications] r9071 - xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/store
by Vincent Massol 10 Apr '08

10 Apr '08

Hi JV, Are you sure about this patch? It looks like it's adding a synchronize() that was not there before and thus all threads will be waiting on this synchronize. Since checkHibernate is called for all database access I'm worried this could lead to performance issues. Has this been tested for performance with a tool like JMeter to simulate multiple users? Note that I haven't analyzed the patch. I'm just worried that we might be introducing a regression in term of performance. If the session factory is only created once then maybe it should be created on app init? Thanks -Vincent On Apr 10, 2008, at 6:21 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2008-04-10 18:21:07 +0200 (Thu, 10 Apr 2008) > New Revision: 9071 > > Modified: > xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java > Log: > XWIKI-2300 : HibernateStore synchronization problem > > Applied patch by Raffaello Pelagalli without modification. Added > comment. > > Modified: xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/ > main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java > =================================================================== > --- xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java 2008-04-10 > 14:45:54 UTC (rev 9070) > +++ xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/ > java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java 2008-04-10 > 16:21:07 UTC (rev 9071) > @@ -510,13 +510,18 @@ > */ > public void checkHibernate(XWikiContext context) throws > HibernateException > { > - > + // Note : double locking is not a recommended pattern and > is not guaranteed to work on all > + // machines. See for example http://www.ibm.com/developerworks/java/library/j-dcl.html > if (getSessionFactory() == null) { > - initHibernate(); > - > - /* Check Schema */ > - if (getSessionFactory() != null) { > - updateSchema(context); > + synchronized(this) { > + if (getSessionFactory() == null) { > + > + initHibernate(); > + /* Check Schema */ > + if (getSessionFactory() != null) { > + updateSchema(context); > + } > + } > } > } > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

4 5

[xwiki-devs] Installation issues using Oracle and WebSphere 6.1
by Jeff Gerbracht 10 Apr '08

10 Apr '08

I've just downloaded the war file, imported it into IBMs RAD Deveolopment environment and followed the Installation and configuration steps to utilize this with our existing Oracle9i Enterprise Edition Release 9.2.0.8.0 database. I tried using a db user other then 'xwiki' by updating the hibernate.cfg.xml file, however, there appears to be some hardcoding somewhere because none of the table were being created and I was getting a db connection exception saying xwiki doesn't exist. Created the xwiki users, updated the hibernate.cfg.xml file and all the tables were created just fine. I am getting the following error at server startup however. Any ideas? [4/10/08 11:22:11:566 EDT] 00000013 ServletWrappe I SRVE0242I: [xWiki-EAR] [/xwikiApp] [action]: Initialization successful. [4/10/08 11:22:11:597 EDT] 00000013 ServiceLogger I com.ibm.ws.ffdc.IncidentStreamImpl initialize FFDC0009I: FFDC opened incident stream file C:\Program Files\IBM\SDP70\runtimes\base_v61\profiles\AppSrv01\logs\ffdc\server1_10181018_08.04.10_11.22.11_0.txt [4/10/08 11:22:11:722 EDT] 00000013 ServiceLogger I com.ibm.ws.ffdc.IncidentStreamImpl resetIncidentStream FFDC0010I: FFDC closed incident stream file C:\Program Files\IBM\SDP70\runtimes\base_v61\profiles\AppSrv01\logs\ffdc\server1_10181018_08.04.10_11.22.11_0.txt [4/10/08 11:22:11:753 EDT] 00000013 WebApp E Error while adding servlet mapping for servlet : action : java.lang.Exception: Mapping clash for ServletWrapper[action:[action:/bin/*, action:/testbin/*, action:/xwiki/*]]: Target com.ibm.ws.portletcontainer.portletserving.PortletServingExtensionProcessor@9160916 already exists at node xwiki at com.ibm.ws.util.ClauseNode.add(ClauseNode.java:59) at com.ibm.ws.util.URIMatcher.put(URIMatcher.java:131) at com.ibm.ws.util.URIMapper.addMapping(URIMapper.java:47) at com.ibm.ws.webcontainer.webapp.WebApp.initializeTargetMappings(WebApp.java:495) at com.ibm.ws.webcontainer.webapp.WebApp.commonInitializationFinish(WebApp.java:304) at com.ibm.ws.wswebcontainer.webapp.WebApp.initialize(WebApp.java:285) at com.ibm.ws.wswebcontainer.webapp.WebGroup.addWebApplication(WebGroup.java:88) at com.ibm.ws.wswebcontainer.VirtualHost.addWebApplication(VirtualHost.java:157) at com.ibm.ws.wswebcontainer.WebContainer.addWebApp(WebContainer.java:655) at com.ibm.ws.wswebcontainer.WebContainer.addWebApplication(WebContainer.java:608) at com.ibm.ws.webcontainer.component.WebContainerImpl.install(WebContainerImpl.java:335) at com.ibm.ws.webcontainer.component.WebContainerImpl.start(WebContainerImpl.java:551) at com.ibm.ws.runtime.component.ApplicationMgrImpl.start(ApplicationMgrImpl.java:1312) at com.ibm.ws.runtime.component.DeployedApplicationImpl.fireDeployedObjectStart(DeployedApplicationImpl.java:1129) at com.ibm.ws.runtime.component.DeployedModuleImpl.start(DeployedModuleImpl.java:569) at com.ibm.ws.runtime.component.DeployedApplicationImpl.start(DeployedApplicationImpl.java:814) at com.ibm.ws.runtime.component.ApplicationMgrImpl.startApplication(ApplicationMgrImpl.java:965) at com.ibm.ws.runtime.component.ApplicationMgrImpl$AppInitializer.run(ApplicationMgrImpl.java:2131) at com.ibm.wsspi.runtime.component.WsComponentImpl$_AsynchInitializer.run(WsComponentImpl.java:341) at com.ibm.ws.util.ThreadPool$Worker.run(ThreadPool.java:1469) -=-----------------------------------------------------------------------------------------------------------------

1 0

[xwiki-devs] [XWiki Syntax] Do we want a special wiki syntax for special characters like emoticons?
by Vincent Massol 10 Apr '08

10 Apr '08

Hi, Since I'm working on the new rendering component it's a good time to decide if we want a special wiki syntax for special icons such as for emoticons and more. For example Confluence has these: http://snipplr.com/view/4931/confluence-emoticons/ I can think of 2 solutions for us: 1) we do the same, i.e. introduce new syntax for these 2) we rely on a macro instead (for ex: {icon:name/}) 1) looks more natural for end users while 2) is more extensible (and would allow us to include the whole Tango library for ex: http://tango.freedesktop.org/images/2/20/Tango-feet.png) . 1) is also way more complex to implement than 2). For 2) we would need to find some way so that it's easy for the user to enter (of course the WYSIWYG editor could have a nice selector for that macro but it would also be nice if it were not too hard to enter in wiki mode). WDYT? Thanks -Vincent

5 5

Re: [xwiki-devs] [xwiki-notifications] r9068 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/hibernate
by Vincent Massol 10 Apr '08

10 Apr '08

Hi Artem, In general whenever you make a commit you must reference a JIRA issue in your commit. The reason is to keep tracability. If you don't put a jira issue then this commit will not appear in the subversion tab in jira for example. The format we use is: " <JIRAID>: <JIRA description> <optional comment here> " Thanks -Vincent On Apr 10, 2008, at 4:11 PM, amelentev (SVN) wrote: > Author: amelentev > Date: 2008-04-10 16:11:38 +0200 (Thu, 10 Apr 2008) > New Revision: 9068 > > Modified: > xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > store/hibernate/HibernateAttachmentVersioningStore.java > Log: > [misc] a bug in my prev commit > > > Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ > xwiki/store/hibernate/HibernateAttachmentVersioningStore.java > =================================================================== > --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > store/hibernate/HibernateAttachmentVersioningStore.java 2008-04-10 > 14:07:22 UTC (rev 9067) > +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > store/hibernate/HibernateAttachmentVersioningStore.java 2008-04-10 > 14:11:38 UTC (rev 9068) > @@ -60,6 +60,7 @@ > { > try { > final XWikiAttachmentArchive archive = new > XWikiAttachmentArchive(); > + archive.setAttachment(attachment); > executeRead(context, bTransaction, > new HibernateCallback<Object>() { > public Object doInHibernate(Session session) > @@ -73,7 +74,6 @@ > return null; > } > }); > - archive.setAttachment(attachment); > attachment.setAttachment_archive(archive); > return archive; > } catch (Exception e) { > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

2 2