Changeset 321


Ignore:
Timestamp:
Mar 29, 2013 6:10:56 PM (6 years ago)
Author:
prjemian
Message:

refs #23: make landing page simpler so pdf will build, put changes details on TRAC ticket, ref the ticket instead

Location:
1dwg/trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • 1dwg/trunk/CHANGES.txt

    r313 r321  
    1010================ 
    1111 
    12 2013-03-28: 
    13  
    14   moved v1.1 branch back to trunk (replacement) 
    15  
    16 * TRAC #13: using the Argonne Open Source License 
    17  
    18 2013-03-27: 
    19  
    20   finishing up the bindings before moving back to trunk 
    21  
    22 * removed java/maven-eclipse directory as indicated by java/README.txt file 
    23 * TRAC #25: PHP code updated to generate v1.1 data files 
    24 * TRAC #26: Python binding complete, reads both v1.0 and v1.1 
    25 * TRAC #28: IgorPro binding needs updating, should read both v1.0 and v1.1 
    26 * TRAC #29: FORTRAN binding needs to be updated (or withdrawn) 
    27 * TRAC #30: Can't easily allow arbitrary order of data columns in Idata group 
    28 * TRAC #31: began work on Java binding 
    29  
    30 2013-03-15: 
    31  
    32   identified that v1.1 is a branch, not yet ready for release 
    33  
    34 * cleanup XSLT and reduce to just one XSLT 
    35 * clean up the examples, remove unnecessary material 
    36 * remove the mediawiki directory, we are done with it now 
    37  
    38 2012-10-31: 
    39  
    40 * TRAC #17: wontfix: clean up rules 
    41 * TRAC #18: added timestamp attribute to SASdata and SAStransmission_spectrum 
    42 * TRAC #20: slight change in format of namespace string and URL 
    43 * TRAC #21: added {any} element at end of SASdata and SAStransmission_spectrum 
    44 * TRAC #22: added SAStransmission_spectrum 
    45 * TRAC #27: rebrand from smallangles.net to cansas.org 
    46  
    47 * slight changes in documentation of units (Angstrom and Celsius) 
    48 * restriction against using UNICODE is lifted 
    49 * removed the Glossary 
     12:2013-04-01 (expected): 
     13    http://www.cansas.org/trac/ticket/23 
    5014         
    5115v1.0 
    5216================ 
    5317 
    54         2009-05-12, tagged version canSAS1d/1.0 
     18:2009-05-12: 
     19    tagged version canSAS1d/1.0 (http://www.cansas.org/trac/changeset/68) 
  • 1dwg/trunk/doc/source/binding-java-jaxb.rst

    r320 r321  
    1818====================== 
    1919 
    20 The basics of the binding are these java statements: 
    21  
    22 .. code-block:: java 
    23  
    24                 // associate a JAXB context with the canSAS namespace URI 
    25                 jc = JAXBContext.newInstance("org.cansas.cansas1d");  
    26                 Unmarshaller unmarshaller = jc.createUnmarshaller(); 
    27  
    28                 // open an XML file from local storage 
    29                 InputStream in = new FileInputStream("a/data/file.xml); 
    30  
    31                 // load the XML file into a Java data structure 
    32                 xmlJavaData = (JAXBElement<SASrootType>) unmarshaller.unmarshal(in); 
    33                  
    34                 // get the SASroot object 
    35                 SASrootType sasroot = xmlJavaData.getValue() 
     20The basics of the binding are these java statements.   
     21First, associate a JAXB context with the canSAS namespace URI 
     22 
     23.. code-block:: java 
     24 
     25        jc = JAXBContext.newInstance("org.cansas.cansas1d");  
     26 
     27Next, create an object to read XML data into Java data objects 
     28created by JAXB from the canSAS XML Schema. 
     29 
     30.. code-block:: java 
     31 
     32        Unmarshaller unmarshaller = jc.createUnmarshaller(); 
     33 
     34Next, open an XML file from local storage. 
     35 
     36.. code-block:: java 
     37 
     38        InputStream in = new FileInputStream("a/data/file.xml); 
     39 
     40Next, load the XML data into a Java data structure 
     41 
     42.. code-block:: java 
     43 
     44        xmlJavaData = (JAXBElement<SASrootType>) unmarshaller.unmarshal(in); 
     45 
     46Next, get the SASroot object 
     47 
     48.. code-block:: java 
     49         
     50        SASrootType sasroot = xmlJavaData.getValue(); 
    3651 
    3752With a `SASroot` object, one can iterate over the `SASentry` groups  
  • 1dwg/trunk/doc/source/downloads.rst

    r313 r321  
    77========= 
    88 
    9 .. note:: See :ref:`CHANGES` history below 
     9Current Release 
     10=================== 
     11 
     12.. note:: See :ref:`CHANGES` history below and repository tickets: 
     13   http://www.cansas.org/trac/report/6?sort=ticket&asc=1 
    1014 
    1115:Version 1.1: 
    12         expected release 2013-04-01 including changes indicated on the TRAC site.  
    13         See :ref:`changes` below. 
    14          
    15         See http://www.cansas.org/trac/report/6?sort=ticket&asc=1 
     16        http://www.cansas.org/trac/ticket/23 
     17        expected release 2013-04-01 
    1618         
    1719        :: 
    1820         
    1921                svn checkout http://www.cansas.org/svn/1dwg/tags/v1.1 cansas1dwg-1.1 
     22 
     23Documentation 
     24------------------- 
     25 
     26HTML: 
     27   http://www.cansas.org/formats/canSAS1d/1.1/doc/ 
     28 
     29:download:`PDF<../cansas-1d-1_1-manual.pdf>`:  
     30   http://www.cansas.org/svn/1dwg/tags/v1.1/doc/cansas-1d-1_1-manual.pdf 
     31 
    2032 
    2133Older Releases 
     
    2840                svn checkout http://www.cansas.org/svn/1dwg/tags/v1.0 cansas1dwg-1.0 
    2941 
     42Documentation 
     43------------------- 
     44 
     45:download:`PDF<../cansas-1d-1_0-manual.pdf>`:  
     46        http://www.cansas.org/svn/1dwg/tags/v1.1/doc/cansas-1d-1_0-manual.pdf 
     47 
    3048.. include:: ../../CHANGES.txt 
  • 1dwg/trunk/doc/source/index.rst

    r313 r321  
    4242   contents 
    4343 
    44 +-------------------------+----------------------+ 
    45 | * :ref:`Preface`        + * :ref:`bindings`    | 
    46 | * :ref:`Specification`  + * :ref:`downloads`   | 
    47 | * :ref:`Examples`       + * :ref:`changes`     | 
    48 | * :ref:`case.studies`   + * :ref:`license`     | 
    49 | * :ref:`Tutorial`       + * :ref:`authors`     | 
    50 +-------------------------+----------------------+ 
     44.. 
     45        +-------------------------+----------------------+ 
     46        | * :ref:`Preface`        + * :ref:`bindings`    | 
     47        | * :ref:`Specification`  + * :ref:`downloads`   | 
     48        | * :ref:`Examples`       + * :ref:`changes`     | 
     49        | * :ref:`case.studies`   + * :ref:`license`     | 
     50        | * :ref:`Tutorial`       + * :ref:`authors`     | 
     51        +-------------------------+----------------------+ 
     52 
     53* :ref:`Preface`           
     54* :ref:`Specification`      
     55* :ref:`Examples`            
     56* :ref:`case.studies`         
     57* :ref:`Tutorial`             
     58* :ref:`bindings`    
     59* :ref:`downloads`  
     60* :ref:`changes`   
     61* :ref:`license`  
     62* :ref:`authors`  
Note: See TracChangeset for help on using the changeset viewer.